Mercurial > hg > pyhgsh

comparison tests/test-merge5.out @ 2175:b2ae81a7df29

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 5c4496ed152d
children
comparison
equal deleted inserted replaced
2174:3044a3fdae76 2175:b2ae81a7df29
1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1 removing b 2 removing b
2 this update spans a branch affecting the following files: 3 this update spans a branch affecting the following files:
3 b 4 b
4 aborting update spanning branches! 5 aborting update spanning branches!
5 (use 'hg merge' to merge across branches or 'hg update -C' to lose changes) 6 (use 'hg merge' to merge across branches or 'hg update -C' to lose changes)