diff tests/test-merge-revert.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 c9226bcc288d
children 966632304dde
line wrap: on
line diff
--- a/tests/test-merge-revert.out	Mon May 01 19:17:34 2006 +0200
+++ b/tests/test-merge-revert.out	Tue May 02 18:44:02 2006 +0200
@@ -1,19 +1,24 @@
 1:016807e6fdaf
 0:eb43f19ff115
 016807e6fdaf tip
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 eb43f19ff115
 eb43f19ff115+
 reverting file1
 ? file1.orig
 eb43f19ff115
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 ? file1.orig
 016807e6fdaf tip
+1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 merging file1
+0 files updated, 1 files merged, 0 files removed, 0 files unresolved
 ? file1.orig
 016807e6fdaf tip
 ? file1.orig
 016807e6fdaf tip
 ? file1.orig
 016807e6fdaf tip
+0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 ? file1.orig
 016807e6fdaf tip