Best practices for merging

[Matt Mackall]

On Thu, 2011-05-26 at 18:33 +0200, Detlev Offenbach 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.

Just merge.

But also read this to see why that works:

http://mercurial.selenic.com/wiki/StandardBranching

-- 
Mathematics is the supreme nostalgia of our time.