comparison tests/test-conflict.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 7544700fd931
children 46280c004f22
comparison
equal deleted inserted replaced
2174:3044a3fdae76 2175:b2ae81a7df29
1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 merge: warning: conflicts during merge 2 merge: warning: conflicts during merge
2 merging a 3 merging a
3 merging a failed! 4 merging a failed!
5 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
6 There are unresolved merges, you can redo the full merge using:
7 hg update -C 2
8 hg merge 1
4 e7fe8eb3e180+0d24b7662d3e+ tip 9 e7fe8eb3e180+0d24b7662d3e+ tip
5 something else 10 something else
6 ======= 11 =======
7 something 12 something
8 M a 13 M a