New user question: Merging single changesets

[Adrian Buehlmann]

On 08.10.2009 19:43, Derek Watson wrote:
> 
> I know this question comes up a lot, so please bear with me. I am coming
> from the Subversion world and am currently using TortoiseHg to manage my
> first mercurial project. I believe I have a classic scenario, but I'm
> slightly unclear on what the best practise is for what I want to do.
> 
> We are using a named branch for our release branch, and the default
> branch is where our bleeding-edge code lives. As you might expect, we
> have some changesets on our release branch that need to be "merged" back
> into our default branch. Unfortunately, our release branch also contains
> a bunch of release-specific code that we do not want coming back into
> our default branch. ...

Then you should split your current release branch into two.

So I suggest to do three branches: default, bugfix and release.

Do the bugfixes in the bugfix branch and merge it into the default
and the release branch.

Don't merge release into default.

Like that, bugfix is a strict subset of release and a strict
subset of default.

Having bleeding edge in default is perfect.