Questions about branching in Mercurial

Guido Ostkamp hg at ostkamp.fastmail.fm
Sun May 6 12:00:07 UTC 2007


> 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.

Regards

Guido



More information about the Mercurial mailing list