diff tests/test-clone.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 57729c56a23c
children aaeb7f5d1052
line wrap: on
line diff
--- a/tests/test-clone.out	Mon May 01 19:17:34 2006 +0200
+++ b/tests/test-clone.out	Tue May 02 18:44:02 2006 +0200
@@ -1,3 +1,4 @@
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 a
 checking changesets
 checking manifests
@@ -10,4 +11,5 @@
 crosschecking files in changesets and manifests
 checking files
 1 files, 1 changesets, 1 total revisions
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 a