[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: Jean Seurin <jean.eastcode_at_gmail.com>
Date: Tue, 12 Jan 2010 11:57:19 +0800

That's more like what we do :)

Actually I was just troubled with the merge possibilities. I've started
to use the merge function recently, and at the same time discovered the
--reintegrate option with the feature branches.
I though maybe there could be something equivalent for release branches.
Now that I feel more familiar with the merge command I'll do manual
merge of bug-fixes from release branch back to trunk.

Thanks Lakshman for sharing your process.
We use feature branch for heavy refactoring sometimes. In this case the
--reintegrate option makes it easier. Subversion has a feature that is
supporting this branch merge back to trunk.
But we don't release from trunk. We do release branch as well. And
that's where the hotfix problem occurs.

cheers
jean

Stein Somers wrote:
> On 11/01/2010 18:09, Tyler Roscoe wrote:
>> 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.
>
> Sure, in the early stages of the release process, but near or past
> D-day, as any decent CMM zero team we switch to panic mode. We hotfix
> things in the release branch, and (re)release, then after the dust has
> settled merge back to trunk. And then see what was wrong with the hotfix.
>
> No problem: you just need to record-only a merge of all the early
> revisions of the branch that you _don't_ want to merge back to trunk
> (like changesets that are merges from trunk themselves), and then
> you're set to easily merge all hotfixes back to trunk.
Received on 2010-01-12 04:57:59 CET

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