Questions about branching in Mercurial

[Matt Mackall]

On Sun, May 06, 2007 at 02:00:07PM +0200, Guido Ostkamp wrote:
> >They've still got a couple rough edges that should be polished up in the 
> >next couple months, but I think they're perfectly useful today provided 
> >you understand how they work.
> 
> In the 'git' User Manual I've found this:
> 
> "Normally a merge results in a merge commit, with two parents, one 
> pointing at each of the two lines of development that were merged.
> 
> However, if one of the two lines of development is completely contained 
> within the other -- so every commit present in the one is already 
> contained in the other -- then git just performs a fast forward; the head 
> of the current branch is moved forward to point at the head of the 
> merged-in branch, without any new commits being created."
> 
> I think this is exactly what is missing in Mercurial as of now. I would 
> appreciate if you could add it.

Yep. Please see:

http://www.selenic.com/mercurial/wiki/index.cgi/BranchPlan

-- 
Mathematics is the supreme nostalgia of our time.