[Cosmo-dev] Branching

[Bobby Rullo]

Sorry to chime in on this so late. I was hoping that everyone else  
would just come to a decision and I would just follow that, since I  
really don't have a strong opinion either way.

So, I give a

+/- 0

to this proposal, meaning I'm fine with it if that's what we decide.

However, I know that Jared and possibly others had envisioned a  
scenario where everyone commits their changes on their own branches  
and whatever changes have been made in a week's time get merged over  
into some other branch which becomes the RC.

This proposal doesn't address (AFAICT) this "cherrypicking" of  
patches which seems like it could be useful for quicker dev cycles.

That being said, what bcm proposed is easy, is what we're all used to  
(well, what I'm used to anyway) and works decently.

bobby
On Aug 14, 2007, at 11:03 AM, Brian Moseley wrote:

> On 8/14/07, Travis Vachon <travis at osafoundation.org> wrote:
>
>> 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?
>
> what i've typically done in the past is create a maintenance branch
> for 0.7 and start spinning rcs off that. once 0.7 final is out, 0.7.1
> work begins on the 0.7 branch. the nature of maintenance releases is
> such that we shouldn't have major refactoring work going on that would
> necessitate any sub-branches. all bug fixes would go onto the 0.7
> branch until 0.7.1 is shipped, at which time those fixes would all be
> merged onto the trunk. future bug fixes would continue on the 0.7
> branch until 0.7.2 is shipped, at which time those fixes would merged
> onto the trunk. and so on and so forth, until the 0.7 line is declared
> dead.
>
>> 2) What about the work Brian's already doing on 0.8? When does that
>> get merged back to trunk?
>
> in the not too distant future after the 0.7 branch is created. if the
> changes i'd been making resulted in widespread breakage, i'd wait til
> all that was resolved before landing the branch, but the changes are
> localized to the dav subsystem, and nothing else in the server depends
> on that. it should be pretty stable now anyway.
>
> i'm not sure what we plan to add to 0.8 other than some amount of the
> dav interop work i've listed on my journal page. we can make a 0.9
> branch off of the trunk when people start to need that, and anybody
> else working on 0.8 can work on the trunk.
> _______________________________________________
> cosmo-dev mailing list
> cosmo-dev at lists.osafoundation.org
> http://lists.osafoundation.org/mailman/listinfo/cosmo-dev