Mercurial > hg
comparison tests/test-merge7.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 | ced2d3620f95 |
| children | e506c14382fd |
comparison
equal
deleted
inserted
replaced
| 2174:3044a3fdae76 | 2175:b2ae81a7df29 |
|---|---|
| 1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
| 1 pulling from ../test-a | 2 pulling from ../test-a |
| 2 searching for changes | 3 searching for changes |
| 3 adding changesets | 4 adding changesets |
| 4 adding manifests | 5 adding manifests |
| 5 adding file changes | 6 adding file changes |
| 6 added 1 changesets with 1 changes to 1 files (+1 heads) | 7 added 1 changesets with 1 changes to 1 files (+1 heads) |
| 7 (run 'hg heads' to see heads, 'hg merge' to merge) | 8 (run 'hg heads' to see heads, 'hg merge' to merge) |
| 8 merge: warning: conflicts during merge | 9 merge: warning: conflicts during merge |
| 9 merging test.txt | 10 merging test.txt |
| 10 merging test.txt failed! | 11 merging test.txt failed! |
| 12 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
| 13 There are unresolved merges, you can redo the full merge using: | |
| 14 hg update -C 1 | |
| 15 hg merge 2 | |
| 11 pulling from ../test-a | 16 pulling from ../test-a |
| 12 searching for changes | 17 searching for changes |
| 13 adding changesets | 18 adding changesets |
| 14 adding manifests | 19 adding manifests |
| 15 adding file changes | 20 adding file changes |
| 23 merging test.txt | 28 merging test.txt |
| 24 resolving test.txt | 29 resolving test.txt |
| 25 file test.txt: my fc3148072371 other d40249267ae3 ancestor 8fe46a3eb557 | 30 file test.txt: my fc3148072371 other d40249267ae3 ancestor 8fe46a3eb557 |
| 26 merging test.txt failed! | 31 merging test.txt failed! |
| 27 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 32 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 28 (branch merge, don't forget to commit) | 33 There are unresolved merges, you can redo the full merge using: |
| 34 hg update -C 3 | |
| 35 hg merge 4 | |
| 29 one | 36 one |
| 30 <<<<<<< | 37 <<<<<<< |
| 31 two-point-five | 38 two-point-five |
| 32 ======= | 39 ======= |
| 33 two-point-one | 40 two-point-one |