diff tests/test-push-hook-lock.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.

--- a/tests/test-push-hook-lock.out	Mon May 01 19:17:34 2006 +0200
+++ b/tests/test-push-hook-lock.out	Tue May 02 18:44:02 2006 +0200
@@ -1,4 +1,6 @@
 adding foo
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 pushing to ../2
 searching for changes
 adding changesets