Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: use correct branch name for counting heads
authorDirkjan Ochtman <dirkjan@ochtman.nl>
Mon, 21 Jul 2008 13:17:51 +0200
changeset 6844 a38dff85d31f
parent 6843 b114a8c7998f
child 6845 835a01a0cdb3
merge: use correct branch name for counting heads
mercurial/commands.py file | annotate | diff | comparison | revisions 
--- a/mercurial/commands.py	Fri Jul 25 13:27:06 2008 +0200
+++ b/mercurial/commands.py	Mon Jul 21 13:17:51 2008 +0200
@@ -1882,7 +1882,7 @@
 
     if not node:
         branch = repo.changectx(None).branch()
-        bheads = repo.branchheads()
+        bheads = repo.branchheads(branch)
         if len(bheads) > 2:
             raise util.Abort(_("branch '%s' has %d heads - "
                                "please merge with an explicit rev") %
Mercurial