tests/test-simple-update.out
author mpm@selenic.com
Tue, 28 Jun 2005 10:42:02 -0800
changeset 511 9f67222186bd
parent 485 c5705ab9cebd
child 642 5d6177b72fcc
permissions -rw-r--r--
Disallow merging of unrelated projects -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Disallow merging of unrelated projects manifest hash: 40badbca64e1ccfd83fee8cd7bf5099f57b6f8bf -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCwZn6ywK+sNU5EO8RAmdeAJ9TAaGSe0nGMdL+Du3AGwm9x28IUgCgpfGG UunOBkobMVLGdHegnOvQkmQ= =VwVi -----END PGP SIGNATURE-----

+ mkdir test
+ cd test
+ echo foo
+ hg init
+ hg addremove
+ hg commit -t 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 -t 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