comparison 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.
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 02 May 2006 18:44:02 +0200
parents 876e4e6ad82b
children 0750f11152fe
comparison
equal deleted inserted replaced
2174:3044a3fdae76 2175:b2ae81a7df29
1 adding foo 1 adding foo
2 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
2 pushing to ../2 4 pushing to ../2
3 searching for changes 5 searching for changes
4 adding changesets 6 adding changesets
5 adding manifests 7 adding manifests
6 adding file changes 8 adding file changes