[Cosmo-dev] Branching

[Mike]

On Aug 14, 2007, at 1:30 PM, Travis Vachon wrote:

> Hi folks
>
> Now that we're rolling a ZBR I'm excited to start working on 0.7.1 
> bugs. I'd like to be able to check my work in, so there are a few 
> questions that need answers:
>
> 1) What's our branching strategy for the 0.7.x releases?

Like Brian mentioned in his reply, I also prefer to create a 0.7 branch 
for all 0.7 work and then make the trunk 0.8-SNAPSHOT

This worked well last time with the caveat that the developers *have* 
to backport all 0.7 bug fixes to the trunk.  If that is not done then 
it's not worth creating a branch.  Because of the refactoring that 
normally accompanies a minor rev change, the devs cannot rely on using 
svn merge to automatically backport fixes in one huge chunk - too much 
will have most likely changed.

>
> 2) What about the work Brian's already doing on 0.8? When does that 
> get merged back to trunk?

Brian get's the joy of doing a merge to the trunk as soon as the trunk 
is tagged as 0.8-SNAPSHOT

---
Bear

Build and Release Engineer
Open Source Applications Foundation (OSAF)
bear at osafoundation.org
http://www.osafoundation.org

bear at code-bear.com
http://code-bear.com

PGP Fingerprint = 9996 719F 973D B11B E111  D770 9331 E822 40B3 CD29


-------------- next part --------------
A non-text attachment was scrubbed...
Name: PGP.sig
Type: application/pgp-signature
Size: 186 bytes
Desc: This is a digitally signed message part
Url : http://lists.osafoundation.org/pipermail/cosmo-dev/attachments/20070814/d66f57a8/PGP.pgp