Re: git? branch-2-2?

[Ralf Wildenhues]

Hi Gary,

* Gary V. Vaughan wrote on Wed, Mar 05, 2008 at 12:10:30AM CET:
> On 4 Mar 2008, at 15:56, Ralf Wildenhues wrote:
>
>> 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...

Good thinking.  All patches so far should strictly be bug fixes.

> 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.

It's true that maintaining branches is much easier with git, as long as
the trees are similar enough that cherry-picking between them works well.

> 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.

Fine with me.

> 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.

That's a plan!

Cheers,
Ralf