Mercurial > hg
changeset 9429:d8143769e1d4
merge: exclude common ancestor from --preview (issue1818)
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Sat, 05 Sep 2009 18:56:51 +0200 |
| parents | 5d6659cfaa06 |
| children | b5e9037d672b d1b135f2f415 |
| files | mercurial/commands.py tests/test-double-merge.out tests/test-merge-default.out tests/test-merge1.out |
| diffstat | 4 files changed, 2 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- 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'))
--- a/tests/test-double-merge.out Thu Aug 27 11:55:21 2009 +0200 +++ b/tests/test-double-merge.out Sat Sep 05 18:56:51 2009 +0200 @@ -1,9 +1,4 @@ created new head -changeset: 0:310fd17130da -user: test -date: Mon Jan 12 13:46:40 1970 +0000 -summary: add foo - changeset: 1:7731dad1c2b9 user: test date: Mon Jan 12 13:46:40 1970 +0000
--- a/tests/test-merge-default.out Thu Aug 27 11:55:21 2009 +0200 +++ b/tests/test-merge-default.out Sat Sep 05 18:56:51 2009 +0200 @@ -13,11 +13,6 @@ 0 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) % should succeed - 2 heads -changeset: 1:ba677d0156c1 -user: test -date: Thu Jan 01 00:00:00 1970 +0000 -summary: b - changeset: 3:903c264cdf57 parent: 1:ba677d0156c1 user: test
--- a/tests/test-merge1.out Thu Aug 27 11:55:21 2009 +0200 +++ b/tests/test-merge1.out Sat Sep 05 18:56:51 2009 +0200 @@ -1,11 +1,6 @@ 0 files updated, 0 files merged, 1 files removed, 0 files unresolved created new head %% no merges expected -changeset: 0:98e00378acd0 -user: test -date: Mon Jan 12 13:46:40 1970 +0000 -summary: commit #0 - changeset: 1:4ee19afe4659 user: test date: Mon Jan 12 13:46:40 1970 +0000