comparison tests/test-remove.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 379ab45b91b7
children 82385773df6c
comparison
equal deleted inserted replaced
2174:3044a3fdae76 2175:b2ae81a7df29
43 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 43 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
44 @@ -1,1 +0,0 @@ 44 @@ -1,1 +0,0 @@
45 -a 45 -a
46 46
47 47
48 0 files updated, 0 files merged, 0 files removed, 0 files unresolved