[Cosmo-dev] Branching

[Mike]

On Aug 14, 2007, at 4:05 PM, Brian Moseley wrote:

> On 8/14/07, Mike <bear at code-bear.com> wrote:
>
>> 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.
>
> i disagree with this. if a change on the maintenance branch requires
> substantial refactoring that might be hard to merge to the trunk, it's
> very likely that's not a change that should be incorporated into a
> maintenance release.

The refactoring that happens on the *trunk* can and does cause merge 
issues - I wasn't talking about refactoring on the branch.

> there's a higher annoyance cost in every developer having to keep the
> maintenance branch and trunk in sync after every commit, and an
> increased management overhead, as somebody else has to review every
> commit to make sure it is applied in both places. not so when we can
> so a single merge after every point release.

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.

---
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/8e640e14/PGP.pgp