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.
commit: suppress spurious new head message for duplicate commit (issue2893)
authorMatt Mackall <mpm@selenic.com>
Wed, 13 Jul 2011 16:43:18 -0500
changeset 14874 d7b424a03627
parent 14873 f79d47813b8b
child 14875 3e9a5c3e24d8
commit: suppress spurious new head message for duplicate commit (issue2893)
mercurial/commands.py file | annotate | diff | comparison | revisions 
--- a/mercurial/commands.py	Wed Jul 13 16:58:51 2011 -0500
+++ b/mercurial/commands.py	Wed Jul 13 16:43:18 2011 -0500
@@ -1105,8 +1105,8 @@
     ctx = repo[node]
     parents = ctx.parents()
 
-    if bheads and not [x for x in parents
-                       if x.node() in bheads and x.branch() == branch]:
+    if (bheads and node not in bheads and not
+        [x for x in parents if x.node() in bheads and x.branch() == branch]):
         ui.status(_('created new head\n'))
         # The message is not printed for initial roots. For the other
         # changesets, it is printed in the following situations:
Mercurial