Mercurial > hg > mercurial-crew-with-dirclash
diff 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 |
line wrap: on
line diff
--- a/tests/test-merge7.out +++ b/tests/test-merge7.out @@ -1,3 +1,4 @@ +1 files updated, 0 files merged, 0 files removed, 0 files unresolved pulling from ../test-a searching for changes adding changesets @@ -8,6 +9,10 @@ added 1 changesets with 1 changes to 1 f merge: warning: conflicts during merge merging test.txt merging test.txt failed! +0 files updated, 0 files merged, 0 files removed, 1 files unresolved +There are unresolved merges, you can redo the full merge using: + hg update -C 1 + hg merge 2 pulling from ../test-a searching for changes adding changesets @@ -25,7 +30,9 @@ resolving test.txt file test.txt: my fc3148072371 other d40249267ae3 ancestor 8fe46a3eb557 merging test.txt failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved -(branch merge, don't forget to commit) +There are unresolved merges, you can redo the full merge using: + hg update -C 3 + hg merge 4 one <<<<<<< two-point-five