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

RE: merging strategy

From: Bob Archer <Bob.Archer_at_amsi.com>
Date: Mon, 15 Feb 2010 16:14:58 -0500

> Hi all,
>
> we are currently rethinking our svn branching strategy and one question
> came up.
>
> To explain what we are planning to do:
>
> We are going to use a release-branching, with adding new features to
> /trunk .
> At some point in time, we will create a ReleaseCandidate-branch from the
> trunk to /branches/Ver_X.Y , which from that point of time will only
> receive bug-fixes, which will also be merged into /trunk.
> At some point, we will consider it stable and tag it as Ver_X.Y .
> Daily new work still goes to trunk and on some point we will create the
> next RC-branch (/branches/Ver_X.Y+1)
>
> Now the problematic thing happens: the customer, who has Ver.X.Y, demands
> an immediate bug-fix. Thus, the plan is to create the bugfix in
> /branches/Ver_X_Y .
>
> But what will be the best practice to merge it? the bugfix also has to go
> to /trunk and to /branches/Ver_X_Y+1.
> Would I merge it to both /trunk and /branches/Ver_X_Y+1 or would I only
> merge it to /branches/Ver_X_Y+1 which then will be merged to /trunk?
>
> What is the best practice or doesn't it matter at all?
>
> Thanks for your help,
> Philipp

You may want to look at how the subversion project itself handles this. They use release branches as you plan however they do not commit code to the branches. All changes are made to trunk then ported to a release branch once it is fully tested and approved.

http://subversion.apache.org/docs/community-guide/releasing.html#releasing

BOb
Received on 2010-02-15 22:14:57 CET

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