[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: Srilakshmanan, Lakshman <lakshman.srilakshmanan_at_police.vic.gov.au>
Date: Tue, 12 Jan 2010 09:41:22 +1100

Hi Jean,

The process we follow is as follows.

All changes & bugFixes are done from branch.
Trunk is used as a stable version.

Steps.
1) Create branch from trunk
2) Perform your change in the branch.
3) Merge changes from trunk to branch since the branch was taken. (A
change/bugFix could take several weeks before released into production)
4) Merge branch back into trunk (re-integrate).
5) Tag trunk
6) release from Tag

The above solved most of our problems, with one exception.

A change in trunk, not yet released into production, and a priority one
bugFix is required. We take a branch from the previous Tag and perform
the bugFix. Tag the branch and release into production to resolve the
emergency.

This situation is very rare and if this situation arises then extreme
care need to be exercised to merge this fix into trunk and a new tag
created from trunk and released into production.

  

Thanks
Lakshman
-----Original Message-----
From: Jean Seurin [mailto:jean.eastcode_at_gmail.com]
Sent: Monday, 11 January 2010 8:51 PM
To: users_at_subversion.apache.org
Subject: Advice on how to merge bug fix from branch to trunk

Hi,

we have a problem we can't solve yet with Subversion.
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.

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.

Developer are really loath to do that. They have enough pression to fix
the bug quickly, not to take some more to keep the process consistant.

I have to find a way to facilitate this bug porting from branch to
trunk.

Unfortunately I can't find any merge example made with this
configuration. It seems it's designed to work the other way, trunk ->
branch.

I'd be interested in others people use of SVN to support their release
process.
Is there a way to get that bug porting made easy with some merge
command?

best rgds,
Jean
Received on 2010-01-11 23:42:33 CET

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