Mercurial > hg

changeset 6844:a38dff85d31f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: use correct branch name for counting heads
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Mon, 21 Jul 2008 13:17:51 +0200
parents b114a8c7998f
children 835a01a0cdb3
files mercurial/commands.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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") %