Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-push-warn.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 | 1b183976e007 |
children | 092039246d73 |
comparison
equal
deleted
inserted
replaced
2174:3044a3fdae76 | 2175:b2ae81a7df29 |
---|---|
1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
1 pushing to ../a | 2 pushing to ../a |
2 searching for changes | 3 searching for changes |
3 abort: unsynced remote changes! | 4 abort: unsynced remote changes! |
4 (did you forget to sync? use push -f to force) | 5 (did you forget to sync? use push -f to force) |
5 pulling from ../a | 6 pulling from ../a |
11 (run 'hg heads' to see heads, 'hg merge' to merge) | 12 (run 'hg heads' to see heads, 'hg merge' to merge) |
12 pushing to ../a | 13 pushing to ../a |
13 searching for changes | 14 searching for changes |
14 abort: push creates new remote branches! | 15 abort: push creates new remote branches! |
15 (did you forget to merge? use push -f to force) | 16 (did you forget to merge? use push -f to force) |
17 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
18 (branch merge, don't forget to commit) | |
16 pushing to ../a | 19 pushing to ../a |
17 searching for changes | 20 searching for changes |
18 adding changesets | 21 adding changesets |
19 adding manifests | 22 adding manifests |
20 adding file changes | 23 adding file changes |
21 added 2 changesets with 1 changes to 1 files | 24 added 2 changesets with 1 changes to 1 files |
22 adding foo | 25 adding foo |
26 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
27 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
28 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
23 merging foo | 29 merging foo |
30 0 files updated, 1 files merged, 0 files removed, 0 files unresolved | |
31 (branch merge, don't forget to commit) | |
24 pushing to ../c | 32 pushing to ../c |
25 searching for changes | 33 searching for changes |
26 abort: push creates new remote branches! | 34 abort: push creates new remote branches! |
27 (did you forget to merge? use push -f to force) | 35 (did you forget to merge? use push -f to force) |
28 pushing to ../c | 36 pushing to ../c |