[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: Re: [Fwd: Re: Branches? How many?]

From: Olivier Dagenais <olivier.dagenais_at_formark.com>
Date: 2007-05-10 16:33:24 CEST

> The issue I'm seeing is that this will create isolated branches that
> will have to be merged into the main branch at one point, which will
> lead to conflict situations which can be quite huge meaning many
> changes
> over a long period of time. If the changes the developers are doing
> are
> on isolated parts of the system using the main trunk to do the work
> will
> lead to smaller conflicts which can be resolved on a per commit basis
> quite easily if nessecary. If of course the changes you are doing are
> all interrelated and most developers work on the same files then it is
> better to use a branch. I also see a tendency to communicate more over
> the code if everyone works on the same codebranch instead of having
> their own private playground but this is purly my opinion.

It only gets to be a merge/integration nightmare if the merge/integration isn't done often enough: http://www.joelonsoftware.com/items/2006/11/29.html

The trade-offs about the different ways of using branches are also explained in the Subversion Best Practices: http://svn.collab.net/repos/svn/trunk/doc/user/svn-best-practices.html

Olivier Dagenais
Software Engineering / Génie logiciel
Formark - Combine the Best of SharePoint® and Livelink®
Phone: 613-599-5173 ext 238
Make sure you don't miss anything: subscribe to the Formark Newsletter:
Received on Thu May 10 16:31:51 2007

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.