[alsa-devel] HG -> GIT migration

[Takashi Iwai]

At Wed, 21 May 2008 17:40:33 +0200,
Rene Herman wrote:
> 
> On 21-05-08 16:47, Takashi Iwai wrote:
> 
> > Theoretically we can work only using merges.  However, the resultant
> > tree will look too complex with lots of merge points at the time of
> > the next merge window.  This is also a nightmare for bisecting.  Thus,
> > most subsystem trees do rebase before the merge window in practice,
> > AFAIK.
> > 
> > It'd be appreciated if someone can tell me any good workflow to keep a
> > good-shaped tree without rebasing...
> 
> Over here:
> 
> http://lkml.org/lkml/2008/5/17/203
> 
> Linus suggests to just not do many merges from upstream -- basically 
> only at releases.

But, this means that the fixes done outside the subsystem tree cannot
be in the subsystem tree itself until the next release.  It's a pretty
weird situation.

Of course, we can do cherry-pick each fix in the upstream, but it
doesn't work always, too.  Suppose a fix that uses a newly introduced
API after the merge window, which doesn't exist in the subsystem
tree yet.  Or, if you want add new patches during the merge window,
etc.

The method Linus suggested is suitable for random patches like tirival
tree, but apparently not for every case.


Takashi