Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-simple-update.out @ 754:3e73bf876f17
Fixes and cleanups to hgeditor:
- "HG: merge resolve" isn't supported for a long time now.
- detection of unchanged commit message if signing is turned off.
- don't add manifest hash to commit message if not signing.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Fri, 22 Jul 2005 07:30:52 +0100 |
| parents | 7e4843b7efd2 |
| children | 61ed30e82b27 |
line wrap: on
line source
+ mkdir test + cd test + echo foo + hg init + hg addremove + hg commit -m 1 + hg verify checking changesets checking manifests crosschecking files in changesets and manifests checking files 1 files, 1 changesets, 1 total revisions + hg clone . ../branch + cd ../branch + hg co + echo bar + hg commit -m 2 + cd ../test + hg pull ../branch pulling from ../branch searching for changes adding changesets adding manifests adding file revisions modified 1 files, added 1 changesets and 1 new revisions (run 'hg update' to get a working copy) + hg verify checking changesets checking manifests crosschecking files in changesets and manifests checking files 1 files, 2 changesets, 2 total revisions + hg co + cat foo foo bar + hg manifest 6f4310b00b9a147241b071a60c28a650827fb03d 644 foo