comparison 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
comparison
equal deleted inserted replaced
348:442eb02cf870 349:b2293093b89e
1 + mkdir test
2 + cd test
3 + echo foo
4 + hg init
5 + hg addremove
6 + hg commit -t 1
7 + hg verify
8 checking changesets
9 checking manifests
10 crosschecking files in changesets and manifests
11 checking files
12 1 files, 1 changesets, 1 total revisions
13 + cd ..
14 + mkdir branch
15 + cd branch
16 + hg init ../test
17 + hg co
18 + echo bar
19 + hg commit -t 2
20 + cd ../test
21 + hg pull ../branch
22 searching for changes
23 adding changesets
24 adding manifests
25 adding file revisions
26 modified 1 files, added 1 changesets and 1 new revisions
27 + hg verify
28 checking changesets
29 checking manifests
30 crosschecking files in changesets and manifests
31 checking files
32 1 files, 2 changesets, 2 total revisions
33 + hg co
34 + cat foo
35 foo
36 bar
37 + hg manifest
38 6f4310b00b9a147241b071a60c28a650827fb03d 644 foo