Re: [PATCH 0/7] combo-layer enhancements

[Paul Eggleton <paul.eggleton@linux.intel.com>]

On Monday 07 November 2011 11:16:26 Koen Kooi wrote:
> With all the fixes in your branch does this allow creating a combo layer
> from scratch with all the history present?

If you expect that it will do that automatically with no conflict resolution 
necessary, then the answer is no I'm afraid. My focus at least for one of 
these patches was to get repo creation starting from the current revision 
working with no hassle. Testing an import of the entire history just now 
though did point out a trivial issue with empty commits which I have now fixed, 
however, "git format-patch" (which is the basis for combo-layer) simply cannot 
handle merges where a conflict was resolved, and AFAICT there is no way around 
this. Typically we don't do merges in the OE-core or bitbake repositories so 
this is not too serious an issue; however, there is at least one merge in the 
OE-core history where there are changes that conflict (an example would be 
76e51a83e1af6c95a8ba780d8d543ddda52e1597 and 
3937aefbefda15a65436238a6c6f1485419c914b). When it gets to these you will have 
to resolve the conflict by hand.

Cheers,
Paul

-- 

Paul Eggleton
Intel Open Source Technology Centre