Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-pull.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 | 4e35843b2683 |
comparison
equal
deleted
inserted
replaced
2174:3044a3fdae76 | 2175:b2ae81a7df29 |
---|---|
7 requesting all changes | 7 requesting all changes |
8 adding changesets | 8 adding changesets |
9 adding manifests | 9 adding manifests |
10 adding file changes | 10 adding file changes |
11 added 1 changesets with 1 changes to 1 files | 11 added 1 changesets with 1 changes to 1 files |
12 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
12 checking changesets | 13 checking changesets |
13 checking manifests | 14 checking manifests |
14 crosschecking files in changesets and manifests | 15 crosschecking files in changesets and manifests |
15 checking files | 16 checking files |
16 1 files, 1 changesets, 1 total revisions | 17 1 files, 1 changesets, 1 total revisions |
18 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
17 foo | 19 foo |
18 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo | 20 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo |
19 pulling from http://localhost:20059/ | 21 pulling from http://localhost:20059/ |
20 searching for changes | 22 searching for changes |
21 no changes found | 23 no changes found |