Mercurial > hg
comparison tests/test-merge1.out @ 2175:b2ae81a7df29
Make hg update more verbose by default (issue12)
(including small changes to revert and backout to not show these stats
with the exception of backout --merge)
Show update stats (unless -q), e.g.:
K files updated, L files merged, M files removed, N files unresolved
Inform the user what to do after a merge:
(branch merge, don't forget to commit)
Inform the user what to do if a branch merge failed:
There are unresolved merges, you can redo the full merge using:
hg update -C X
hg merge Y
Inform the user what to do if a working directory merge failed:
There are unresolved merges with locally modified files.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Tue, 02 May 2006 18:44:02 +0200 |
| parents | 2da2d46862fb |
| children | a31557193f3c |
comparison
equal
deleted
inserted
replaced
| 2174:3044a3fdae76 | 2175:b2ae81a7df29 |
|---|---|
| 1 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
| 1 %% no merges expected | 2 %% no merges expected |
| 3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 4 (branch merge, don't forget to commit) | |
| 5 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
| 2 %% merge should fail | 6 %% merge should fail |
| 3 abort: 'b' already exists in the working dir and differs from remote | 7 abort: 'b' already exists in the working dir and differs from remote |
| 4 %% merge of b expected | 8 %% merge of b expected |
| 5 merging for b | 9 merging for b |
| 6 merging b | 10 merging b |
| 11 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
| 12 (branch merge, don't forget to commit) | |
| 7 %% | 13 %% |
| 14 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 8 Contents of b should be "this is file b1" | 15 Contents of b should be "this is file b1" |
| 9 This is file b1 | 16 This is file b1 |
| 10 %% merge fails | 17 %% merge fails |
| 11 abort: outstanding uncommitted changes | 18 abort: outstanding uncommitted changes |
| 12 %% merge expected! | 19 %% merge expected! |
| 13 merging for b | 20 merging for b |
| 14 merging b | 21 merging b |
| 22 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
| 23 (branch merge, don't forget to commit) | |
| 24 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 15 %% merge of b should fail | 25 %% merge of b should fail |
| 16 abort: outstanding uncommitted changes | 26 abort: outstanding uncommitted changes |
| 17 %% merge of b expected | 27 %% merge of b expected |
| 18 merging for b | 28 merging for b |
| 19 merging b | 29 merging b |
| 30 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
| 31 (branch merge, don't forget to commit) |