[Cosmo-dev] Branching

[Travis Vachon]

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?
     a) Branches off trunk that are merged back to trunk at the time  
of the "dot release"?
     b) Branches off a "0.7" branch that is kept "0.7 pristine",  
merging the branches back to trunk at the time of "dot releases"?
     c) Other?

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

It would be nice to set a precedent that everyone is happy (or at  
least not unhappy) with during the next month or so, so my intention  
with this thread is to come to that consensus.

-Travis