Mercurial > hg
annotate tests/test-clone.out @ 2548:0229ff95faec
Clarified message when nothing to merge is seen.
Sometimes there's a non-tip head waiting to be merged, especially after
pulling in remote changes while there were local modifications in the working
directory which had to be committed before 'hg merge' can work.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Mon, 03 Jul 2006 19:14:29 +0200 |
| parents | b2ae81a7df29 |
| children | aaeb7f5d1052 |
| rev | line source |
|---|---|
|
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2152
diff
changeset
|
1 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 550 | 2 a |
| 3 checking changesets | |
| 4 checking manifests | |
| 5 crosschecking files in changesets and manifests | |
| 6 checking files | |
| 7 1 files, 1 changesets, 1 total revisions | |
|
1926
ba198d17eea9
changes by John Levon to standardize some erroroutput
Peter van Dijk <peter@dataloss.nl>
parents:
925
diff
changeset
|
8 a not present |
| 550 | 9 checking changesets |
| 10 checking manifests | |
| 11 crosschecking files in changesets and manifests | |
| 12 checking files | |
| 13 1 files, 1 changesets, 1 total revisions | |
|
2175
b2ae81a7df29
Make hg update more verbose by default (issue12)
Thomas Arendsen Hein <thomas@intevation.de>
parents:
2152
diff
changeset
|
14 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 550 | 15 a |