Show More
@@ -2150,7 +2150,8 b' def merge(ui, repo, node=None, **opts):' | |||||
2150 | roots, heads = [common.node()], [p2.node()] |
|
2150 | roots, heads = [common.node()], [p2.node()] | |
2151 | displayer = cmdutil.show_changeset(ui, repo, opts) |
|
2151 | displayer = cmdutil.show_changeset(ui, repo, opts) | |
2152 | for node in repo.changelog.nodesbetween(roots=roots, heads=heads)[0]: |
|
2152 | for node in repo.changelog.nodesbetween(roots=roots, heads=heads)[0]: | |
2153 | displayer.show(repo[node]) |
|
2153 | if node not in roots: | |
|
2154 | displayer.show(repo[node]) | |||
2154 | return 0 |
|
2155 | return 0 | |
2155 |
|
2156 | |||
2156 | return hg.merge(repo, node, force=opts.get('force')) |
|
2157 | return hg.merge(repo, node, force=opts.get('force')) |
@@ -1,9 +1,4 b'' | |||||
1 | created new head |
|
1 | created new head | |
2 | changeset: 0:310fd17130da |
|
|||
3 | user: test |
|
|||
4 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
|||
5 | summary: add foo |
|
|||
6 |
|
||||
7 | changeset: 1:7731dad1c2b9 |
|
2 | changeset: 1:7731dad1c2b9 | |
8 | user: test |
|
3 | user: test | |
9 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
4 | date: Mon Jan 12 13:46:40 1970 +0000 |
@@ -13,11 +13,6 b" abort: branch 'default' has 3 heads - pl" | |||||
13 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
13 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
14 | (branch merge, don't forget to commit) |
|
14 | (branch merge, don't forget to commit) | |
15 | % should succeed - 2 heads |
|
15 | % should succeed - 2 heads | |
16 | changeset: 1:ba677d0156c1 |
|
|||
17 | user: test |
|
|||
18 | date: Thu Jan 01 00:00:00 1970 +0000 |
|
|||
19 | summary: b |
|
|||
20 |
|
||||
21 | changeset: 3:903c264cdf57 |
|
16 | changeset: 3:903c264cdf57 | |
22 | parent: 1:ba677d0156c1 |
|
17 | parent: 1:ba677d0156c1 | |
23 | user: test |
|
18 | user: test |
@@ -1,11 +1,6 b'' | |||||
1 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
1 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
2 | created new head |
|
2 | created new head | |
3 | %% no merges expected |
|
3 | %% no merges expected | |
4 | changeset: 0:98e00378acd0 |
|
|||
5 | user: test |
|
|||
6 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
|||
7 | summary: commit #0 |
|
|||
8 |
|
||||
9 | changeset: 1:4ee19afe4659 |
|
4 | changeset: 1:4ee19afe4659 | |
10 | user: test |
|
5 | user: test | |
11 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
6 | date: Mon Jan 12 13:46:40 1970 +0000 |
General Comments 0
You need to be logged in to leave comments.
Login now