Best practices for merging

[Peter Bourgon]

The transplant extension allows you to "copy" a committed changeset
from one branch to another in this way.

 [maintenance] $ hg commit -m "bugfix" # changeset abcdef
 [maintenance] $ hg update default
 [default] $ hg transplant --log abcdef
 [default] $ hg push # 2 changesets


On Thu, May 26, 2011 at 6:33 PM, Detlev Offenbach
<detlev at die-offenbachs.de> wrote:
> Hello,
>
> I have the following situation I would like to know how to do it the best way.
>
> I have two development branches. Branch A (default) is the feature branch,
> where I do the ongoing development. Branch B is the current maintenance branch
> that receives just bug fixes. When I fixed a bug in branch B and committed it,
> I would like to copy the same changeset to branch A in order to not do the
> changes twice.
>
> Regards,
> Detlev
> --
> Detlev Offenbach
> detlev at die-offenbachs.de
> _______________________________________________
> Mercurial mailing list
> Mercurial at selenic.com
> http://selenic.com/mailman/listinfo/mercurial
>