comparison tests/test-backout.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 ec96c4518236
children 6c9305fbebaf
comparison
equal deleted inserted replaced
2174:3044a3fdae76 2175:b2ae81a7df29
14 # backout with merge 14 # backout with merge
15 adding a 15 adding a
16 changeset 3:6c77ecc28460 backs out changeset 1:314f55b1bf23 16 changeset 3:6c77ecc28460 backs out changeset 1:314f55b1bf23
17 merging with changeset 2:b66ea5b77abb 17 merging with changeset 2:b66ea5b77abb
18 merging a 18 merging a
19 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
20 (branch merge, don't forget to commit)
19 line 1 21 line 1