Mercurial > public > mercurial-scm > hg-stable

diff mercurial/commands.py @ 11181:6e65b451b62e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit: fix complaint about branch merge creating new heads (issue2186)
author Matt Mackall <mpm@selenic.com>
date Sat, 15 May 2010 21:24:23 -0500
parents 4b02fc71bbba
children 6d7cf82453be
line wrap: on
line diff
--- a/mercurial/commands.py	Sat May 15 00:34:07 2010 +0300
+++ b/mercurial/commands.py	Sat May 15 21:24:23 2010 -0500
@@ -766,7 +766,8 @@
     ctx = repo[node]
     parents = ctx.parents()
 
-    if bheads and [x for x in parents if x.node() not in bheads]:
+    if bheads and [x for x in parents
+                   if x.node() not in bheads and x.branch() == branch]:
         ui.status(_('created new head\n'))
 
     if not opts.get('close_branch'):