Mercurial > hg
view tests/test-pull.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 | 4e35843b2683 |
| children | 9d1c3529ebbc |
line wrap: on
line source
(the addremove command is deprecated; use add and remove --after instead) adding foo checking changesets checking manifests crosschecking files in changesets and manifests checking files 1 files, 1 changesets, 1 total revisions requesting all changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files 1 files updated, 0 files merged, 0 files removed, 0 files unresolved checking changesets checking manifests crosschecking files in changesets and manifests checking files 1 files, 1 changesets, 1 total revisions 0 files updated, 0 files merged, 0 files removed, 0 files unresolved foo 2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo pulling from http://localhost:20059/ searching for changes no changes found