Mercurial > hg > mercurial-crew-with-dirclash
diff 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 |
line wrap: on
line diff
--- a/tests/test-push-warn.out +++ b/tests/test-push-warn.out @@ -1,3 +1,4 @@ +1 files updated, 0 files merged, 0 files removed, 0 files unresolved pushing to ../a searching for changes abort: unsynced remote changes! @@ -13,6 +14,8 @@ pushing to ../a searching for changes abort: push creates new remote branches! (did you forget to merge? use push -f to force) +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +(branch merge, don't forget to commit) pushing to ../a searching for changes adding changesets @@ -20,7 +23,12 @@ adding manifests adding file changes added 2 changesets with 1 changes to 1 files adding foo +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +1 files updated, 0 files merged, 0 files removed, 0 files unresolved +1 files updated, 0 files merged, 0 files removed, 0 files unresolved merging foo +0 files updated, 1 files merged, 0 files removed, 0 files unresolved +(branch merge, don't forget to commit) pushing to ../c searching for changes abort: push creates new remote branches!