[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 11:26:41 -0800

On Mon, Jan 11, 2010 at 07:54:34PM +0100, 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.

And I'm sure you never lose track of any "hotfixes" done in this way.

There are a lot of things you *can* do to solve this problem. I'm simply
stating what I think is the accepted best practice. Caveat coder, etc.
etc.

tyler
Received on 2010-01-11 21:06:46 CET

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