diff tests/test-flags.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 966632304dde 455109df3669
line wrap: on
line diff
--- a/tests/test-flags.out	Mon May 01 19:17:34 2006 +0200
+++ b/tests/test-flags.out	Tue May 02 18:44:02 2006 +0200
@@ -5,6 +5,7 @@
 adding file changes
 added 1 changesets with 2 changes to 2 files
 (run 'hg update' to get a working copy)
+2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 pulling from ../test2
 searching for changes
 adding changesets