changeset 9429 | d8143769e1d4 |
parent 9189 | c2041f80f22a |
child 9430 | b5e9037d672b |
child 9450 | e78967d3dd6f |
--- a/mercurial/commands.py Thu Aug 27 11:55:21 2009 +0200 +++ b/mercurial/commands.py Sat Sep 05 18:56:51 2009 +0200 @@ -2150,7 +2150,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'))