Re: git? branch-2-2?

[Gary V. Vaughan]

Hallo Ralf,

On 4 Mar 2008, at 15:56, Ralf Wildenhues wrote:
> 1) Can we move to use git now?

Finally!! Yes, please.

> 2) Can we create a branch-2-2 and cherry-pick bugfixes from HEAD
> into it, aiming for a soonish 2.2.2 (let's say, in a few weeks;
> already a few important issues are known)?

Is CVS HEAD already the recipient of destabilising patches?  I had  
anticipated applying fixes on CVS HEAD for a while and then branching  
to save time moving patches between branches during the interim...

If all the patches that went in so far are fixes, then let's wait  
until the last possible moment before branching, and save on the  
number of simultaneous branches we have to maintain.

We already discovered that maintaining branch-1-5, branch-2-0 and HEAD  
was too much work.  I think we should mothball branch-1-5 now, and  
apply everything to CVS HEAD until such times as a destabilising patch  
forces us to create branch-2-2.

> 3) If yes and yes, do you agree with the proposed git policy:
> master should usually not contain merges except for merges from public
> topic branches, should we have such in the future.  Generally, master
> should be the first to receive a patch, and stable branches should
> cherry-pick from master.  In your local trees, you should rebase  
> private
> topic branches against the upstream tree before inclusion.

In principle that seems like a great idea.  Like Bob, I worry that  
cherry-picking will soon become out and out porting... but that's just  
semantics.  I have no problem with a policy of not porting from stable  
to master when the reverse is feasible.

> If you agree, I just might look into doing the work.

Okay, I agree to everything! :-)

> I'm a bit unsure whether 2.2.2 should come before the move to git.
> Comments appreciated.


I think we should wait until we are reasonably sure that we won't need  
a maintenance release for several weeks before cutting over to git.   
2.2.2 in a few weeks is a worthy goal (2.1b and 2.2 were on the first  
of the month, so April 1st seems like a good target), so lets use our  
resources to make that happen before worrying about git.

Cheers,
        Gary
--
  ())_.              Email me: address@hidden
  ( '/           Read my blog: http://blog.azazil.net
  / )=         ...and my book: http://sources.redhat.com/autobook
`(_~)_

PGP.sig
Description: This is a digitally signed message part