A Guide to Branching in Mercurial

[Alexander Schatten]

Thanks for this article, good to read;

I have, however, one question: as far as my limited understanding of branches goes, there is (opposed to one of the comments) a significant difference in how merges are treatet.

(1) When you just make an anonymous branch by updating to an older version and committing, then e.g. go back to the default branch and hit “hg merge” the anonymous and default branche are merged without further ado

(2) If you create named branches, and again, hit “hg merge” nothing happens.
That means: named branches are not merged "by default".

I hope I make myself clear. Is that correct, or do I get something wrong?


-------- Original-Nachricht --------
> Datum: Thu, 03 Sep 2009 00:08:57 +0200
> Von: Martin Geisler <mg at lazybytes.net>
> An: mercurial at selenic.com
> Betreff: A Guide to Branching in Mercurial

> Hi everybody,
> 
> I found this very nice post by Steve Losh today:
> 
>  
> http://stevelosh.com/blog/entry/2009/8/30/a-guide-to-branching-in-mercurial/
> 
> It gives a great explaination about how branches work in Mercurial and
> how they compare to Git.
> 
> -- 
> Martin Geisler