[0/7] combo-layer enhancements

Submitted by Paul Eggleton on Nov. 4, 2011, 5:55 p.m.

Details

Message ID cover.1320429268.git.paul.eggleton@linux.intel.com
State Accepted
Headers show

Pull-request

git://git.openembedded.org/openembedded-core-contrib paule/combo-layer-fixes2

Commit Message

Paul Eggleton Nov. 4, 2011, 5:55 p.m.
A batch of improvements to the combo-layer tool.

The following changes since commit e3c003282afb93ec52882496400b042620ab00ef:

  rt-tests: update to 0.83 (2011-11-04 15:43:19 +0000)

are available in the git repository at:
  git://git.openembedded.org/openembedded-core-contrib paule/combo-layer-fixes2
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/combo-layer-fixes2

Paul Eggleton (7):
  scripts/combo-layer: handle merge commits
  scripts/combo-layer: make init set up initial component data
  scripts/combo-layer: tidy up config example
  scripts/combo-layer: make component repo branch configurable
  scripts/combo-layer: fix dirty repo check
  scripts/combo-layer: auto-commit updated config file
  scripts/combo-layer: improve some messages

 scripts/combo-layer              |  121 +++++++++++++++++---------------------
 scripts/combo-layer.conf.example |   28 +++++++--
 2 files changed, 75 insertions(+), 74 deletions(-)

Comments

Otavio Salvador Nov. 4, 2011, 6:15 p.m.
On Fri, Nov 4, 2011 at 15:55, Paul Eggleton
<paul.eggleton@linux.intel.com> wrote:
...
>  scripts/combo-layer: auto-commit updated config file
...

As said on IRC I'd prefer to the auto-commit do not replace the author
as it gives the possibility to easily figure who did the update on the
repository.
Paul Eggleton Nov. 7, 2011, 10:14 a.m.
On Friday 04 November 2011 16:15:59 Otavio Salvador wrote:
> As said on IRC I'd prefer to the auto-commit do not replace the author
> as it gives the possibility to easily figure who did the update on the
> repository.

OK, I've removed the override of the author and re-pushed the branch.

Cheers,
Paul
Koen Kooi Nov. 7, 2011, 10:16 a.m.
Op 7 nov. 2011, om 11:14 heeft Paul Eggleton het volgende geschreven:

> On Friday 04 November 2011 16:15:59 Otavio Salvador wrote:
>> As said on IRC I'd prefer to the auto-commit do not replace the author
>> as it gives the possibility to easily figure who did the update on the
>> repository.
> 
> OK, I've removed the override of the author and re-pushed the branch.

With all the fixes in your branch does this allow creating a combo layer from scratch with all the history present?

regards,

Koen
Paul Eggleton Nov. 7, 2011, 12:16 p.m.
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