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

RE: Advice on how to merge bug fix from branch to trunk

From: Bob Archer <Bob.Archer_at_amsi.com>
Date: Mon, 11 Jan 2010 12:14:36 -0500

> On Mon, Jan 11, 2010 at 05:50:53PM +0800, Jean Seurin wrote:
> > In our process, we create a branch of a version that is going to
> be
> > released. Then we release from that branch and create a tag for
> each
> > released version.
>
> I assume you create the branch from the trunk?
>
> > The problem lies in the bug fix of this released version. We have
> to
> > apply manually the fix to the branch, release a new tag, and then
> report
> > the same modification to the trunk.
>
> The usual way to do this is to make the bugfix on trunk and then
> cherrypick merge the change from trunk up to your branch. Is there
> a
> reason you can't do it this way?
>

Why not make the fix on the branch then merge that to trunk? It works just as well. This is usually the work flow we use.

BOb
Received on 2010-01-11 18:14:55 CET

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