Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-simple-update.out @ 349:b2293093b89e
Merged with mercurial-identify (which includes upstream's current tip)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Merged with mercurial-identify (which includes upstream's current tip)
manifest hash: b135d201757b84bbe7f14a446d2b001fd0cc1aa2
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFCr9mNW7P1GVgWeRoRAmTjAJ919wnvZXbKI27N0cDJCrumR3z4rQCcD6PO
yZTmrT6p+gt6GBO+j5FVBn0=
=HWn8
-----END PGP SIGNATURE-----
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Wed, 15 Jun 2005 08:32:29 +0100 |
| parents | 55f63f3b6a54 |
| children | b4e0e20646bb |
line wrap: on
line diff
new file mode 100644 --- /dev/null +++ b/tests/test-simple-update.out @@ -0,0 +1,38 @@ ++ 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 ++ cd .. ++ mkdir branch ++ cd branch ++ hg init ../test ++ hg co ++ echo bar ++ hg commit -t 2 ++ cd ../test ++ hg pull ../branch +searching for changes +adding changesets +adding manifests +adding file revisions +modified 1 files, added 1 changesets and 1 new revisions ++ 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