Re: [Adeos-main] Re: [RFC] git workflow

[Wolfgang Denk <wd@domain.hid>]

Dear Jan,

in message <45881A69.1040704@domain.hid> you wrote:
>
> This is one of my motivations to push git forward. Having
> 2.6.20-rcX+ipipe already available for download and testing may help to
> follow the kernel development on the bleeding edge more closely.

Agreed.

> The other aspect is that when you merge the kernel patches into a
> working ipipe tree and you get a conflict, you also directly obtain
> information about what change caused it and maybe what the background of
> that patch was. That's at least my theory which still needs to be proven
> in practice.

THis will work, but if you go this route you will sonn have the git
repo only, as it will become more and more difficult to extract the
ipipe patches which you need anyway.

That's why I recommend to use stgit to maintain the ipipe patches. So
you have a clearly defined flow of information.

> I heard about it before, but I still have to take a closer look. Does
> this generate also some kind of publishable git tree with history for
> the managed patches? ...

Yes, it does.

>                  ... One problem with a stack might be that we loose
> information about ipipe changes themselves. ...

No, that's not true, as the patches itself are managed under git,  so
you have the full power of git for the patch history, too.

This will be much more powerful than the  other  approach  -  if  you
maintain  a  patched  tree  under git, it will be pretty difficult to
find out which changes make up the ipipe patch, and which  are  other
stuff.

>                                         ... My idea is that some
> modification to the ipipe core stored as commit in the reference tree
> could directly be pulled by other arch maintainers.

That sounds as if you are planning  to  use  stgit  already,  without
knowing it yet :-)

Best regards,

Wolfgang Denk

-- 
Software Engineering:  Embedded and Realtime Systems,  Embedded Linux
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd@domain.hid
"Just think, with VLSI we can have 100 ENIACS on a chip!"
- Alan Perlis