comparison tests/test-pull-permission.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
comparison
equal deleted inserted replaced
2174:3044a3fdae76 2175:b2ae81a7df29
1 requesting all changes 1 requesting all changes
2 adding changesets 2 adding changesets
3 adding manifests 3 adding manifests
4 adding file changes 4 adding file changes
5 added 1 changesets with 1 changes to 1 files 5 added 1 changesets with 1 changes to 1 files
6 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
6 checking changesets 7 checking changesets
7 checking manifests 8 checking manifests
8 crosschecking files in changesets and manifests 9 crosschecking files in changesets and manifests
9 checking files 10 checking files
10 1 files, 1 changesets, 1 total revisions 11 1 files, 1 changesets, 1 total revisions