[oe] openmoko-merges

[Ricardo Salveti de Araujo]

On Fri, Dec 19, 2008 at 7:48 AM, Graeme Gregory <dp at xora.org.uk> wrote:
> John Lee wrote:
>> I'll keep working on the fastboot branch (need the help of original
>> author on this one.  since this will become general changes, it's not
>> going to be easy), and reorganize the om-merge branch a bit.  Is this
>> the first time of such a big merge ?  I think Graeme and I both did
>> some merge back before, but this one seems to be bigger...
>>
> I used to use a process similar to what koen suggested where I would
> only merge back into OE the final changes to a .bb not all the
> mistakes/fuckups/typos that got us to that result. Then evaluate each
> change on its own to judge its level of controversy.

Yep, this is something I was thinking about this week, where I decided
to reorganize the Mamona patches to merge it back to OE.

Merging related modifications in just one patch helps a lot to review
the code and also to merge it upstream, the bad part is that we lose
all the history behind those patches. Adding a message telling that
the patch came from Mamona helps this issue, as the user could see it
at the Mamona own repository, but still don't know what's the
preferred way.

What are your suggestions? Should I create branches and rebase Mamona
repo to do the merge with all the history or just merging related
commits in one is enough (also with branches and review)?

Thanks,
-- 
Ricardo Salveti de Araujo