Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-simple-update.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 |
---|---|
2 checking changesets | 2 checking changesets |
3 checking manifests | 3 checking manifests |
4 crosschecking files in changesets and manifests | 4 crosschecking files in changesets and manifests |
5 checking files | 5 checking files |
6 1 files, 1 changesets, 1 total revisions | 6 1 files, 1 changesets, 1 total revisions |
7 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
8 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
7 pulling from ../branch | 9 pulling from ../branch |
8 searching for changes | 10 searching for changes |
9 adding changesets | 11 adding changesets |
10 adding manifests | 12 adding manifests |
11 adding file changes | 13 adding file changes |
14 checking changesets | 16 checking changesets |
15 checking manifests | 17 checking manifests |
16 crosschecking files in changesets and manifests | 18 crosschecking files in changesets and manifests |
17 checking files | 19 checking files |
18 1 files, 2 changesets, 2 total revisions | 20 1 files, 2 changesets, 2 total revisions |
21 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
19 foo | 22 foo |
20 bar | 23 bar |
21 6f4310b00b9a147241b071a60c28a650827fb03d 644 foo | 24 6f4310b00b9a147241b071a60c28a650827fb03d 644 foo |