john_lee at openmoko.org
Thu Dec 18 17:35:18 CET 2008
On Thu, Dec 18, 2008 at 04:24:04PM +0100, Koen Kooi wrote:
> On 18-12-08 16:05, John Lee wrote:
>> Okay, here is what I will do:
>> 1) commit zero controversial part into oe.dev first.
> You don't know if it's controversial or not without it being reviewed.
> So no, don't commit stuff.
Although I haven't committed directly upstream for quite a while, I
think I can be the judge of that. Feel free to revert and explain if
>> 2) put fastboot related stuffs into another branch for review
> Make another branch for the stuff you thing is non-controversial so we
> can review that as well.
>> 3) rebase -i the rest to create a clean history, force update the
>> openmoko-merges branch, then ask for review again.
> Try to keep every branch below approx 30 commits, otherwise it becomes
> to cumbersome to review.
Yes sir, will do.
>> On Thu, Dec 18, 2008 at 03:19:01PM +0800, John Lee wrote:
>>> Please review john_lee/openmoko-merges. I started from
>>> holger/openmoko-merges then rebased it to oe.dev.
>>> The general principle is:
>>> 1) Minimal impact: most of the big changes apply to om distro only.
>>> My thought is we merge this first, then apply to the general.
>>> 2) Keep history: I did it the hard way by cherry-picking one by one
>>> since the history is different after the mtn->git switch. Most of the
>>> commit messages are kept, but that creates a lot of commits to review.
>>> 3) PKG_TAGS, qtopia, toolchain, om-utils and opkg stuffs are left out
>>> for later merge.
>>> Not sure how long it's going to take. My plan is to merge it this
>>> Monday if it's okay...
>>> Openembedded-devel mailing list
>>> Openembedded-devel at lists.openembedded.org
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
More information about the Openembedded-devel