[Cosmo-dev] Cosmo 0.7.1 release plan

[Matthew Eernisse]

This sounds good.

I particularly like getting it going right away and tweaking the process 
as we go -- as well as the idea of fixes that miss the release deadline 
having to "wait for the next tram."

Ted Leung wrote:
> - We've only seen one proposal for how to manage branchng, so we're 
> going to do that one, which is to base the 0.7.x branches off of 0.7.   
> We will merge the changes from 0.7.1 into the trunk when 0.7.1 releases, 
> but we will also merge them into 0.7.2 as soon as QA begins so that 
> 0.7.2 development can proceed.   It is going to be important to keep the 
> .7.x branches and the trunk in buildable/releasable states.

This sounds a bit different from what Bear wrote in his reply to this:

 > My thoughts are that as 0.7.x fixes are applied I should also be seeing
 > the patches being applied to trunk and that as soon as 0.7.x is signed
 > off by QA I will need to create a 0.7.x+1 branch and close 0.7.x

And:

> When QA starts working on 0.7.1, the 0.7.2 branch will be created. 
> Any changes to 0.7.1 made after the 0.7.2 branch will need to be 
 > merged forward.

FWIW, I prefer the simplicity of what Bear's proposed process -- that 
the branch for the next dot release happens at the point that QA takes 
the ball for the current one. That way we don't have to merge changes 
back to trunk and forward to the next release. (The only ones to have to 
be merged forward would be ones that happen after the QA process has 
happened, and those ought to be few.)

Also, I think it might be simpler to merge changes back to trunk as 
they're committed, rather than in a big batch when each dot-release 
happens -- but I don't really feel strongly about it.


Matthew