[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: Tyler Roscoe <tyler_at_cryptio.net>
Date: Mon, 11 Jan 2010 09:09:46 -0800

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?

tyler
Received on 2010-01-11 18:12:50 CET

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