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

Re: Shared branch vs single branch

From: Les Mikesell <lesmikesell_at_gmail.com>
Date: Mon, 23 Sep 2013 14:31:48 -0500

On Mon, Sep 23, 2013 at 1:50 PM, Bob Archer <Bob.Archer_at_amsi.com> wrote:
>> It really depends. I think all work for a specific release should be done in a single branch/folder. Many people follow the stable trunk model. In this model you generally do all work on trunk and then branch for a release. This is the same model svn itself is developed under. In this model you would also use what are called "feature" branches. This is generally for a feature/use case that will take more than a day to complete or will be worked on by more than one developer.
> Once again, it's up to the people not the tool to ensure your release management is done properly.

Well, sort-of. It is always a good idea to (a) include tests for new
code and (b) have a workflow that ensures that the tests are run and
that someone checks the results. Expecting one person to never make
a mistake just doesn't always work out.

A general rule can't cover all cases, but in general I think the
longer you let branches diverge with isolated work, the more likely
they are to have conflicting changes that will take extra work to
resolve when you finally do merge.

  Les Mikesell
Received on 2013-09-23 21:32:34 CEST

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.