[Cosmo-dev] Branching

[Matthew Eernisse]

I was out, and so I didn't chime in on this -- of course if we don't end 
up doing major feature work off on a point release branch, there is a 
smaller chance of bad stuff happening with a big merge.

But doing commits in both places at the same time would do a lot more to 
eliminate the chance of "Hey, X has disappeared. I wonder what else 
might be missing." I think it also might be simpler to manage in cases 
where an affected area of code has been refactored on the trunk. Even 
though it is kind of a pain.


M.

Brian Moseley wrote:
> On 8/14/07, Mike <bear at code-bear.com> wrote:
> 
>> The changes have to be merged - whether it's done for each or as part
>> of a single merge is up to the dev team.  I'm just pointing out that in
>> the past the single-release-backport-merge and is often not simple.
> 
> i've messed these up in the past, so i won't argue, tho i'm pretty
> sure i have it down now. if the rest of the team wants to commit them
> in both places at the same time, then fine.
> _______________________________________________
> cosmo-dev mailing list
> cosmo-dev at lists.osafoundation.org
> http://lists.osafoundation.org/mailman/listinfo/cosmo-dev
>