Mercurial > public > mercurial-scm > hg-stable

diff mercurial/commands.py @ 9430:b5e9037d672b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew-stable
author Patrick Mezard <pmezard@gmail.com>
date Sat, 05 Sep 2009 19:39:46 +0200
parents c8e4dc218aaf d8143769e1d4
children c564dbb2a6d5 08914fd0fddb
line wrap: on
line diff
--- a/mercurial/commands.py	Fri Sep 04 23:45:13 2009 +0200
+++ b/mercurial/commands.py	Sat Sep 05 19:39:46 2009 +0200
@@ -2155,7 +2155,8 @@
         roots, heads = [common.node()], [p2.node()]
         displayer = cmdutil.show_changeset(ui, repo, opts)
         for node in repo.changelog.nodesbetween(roots=roots, heads=heads)[0]:
-            displayer.show(repo[node])
+            if node not in roots:
+                displayer.show(repo[node])
         return 0
 
     return hg.merge(repo, node, force=opts.get('force'))