annotate tests/test-simple-update.out @ 350:b4e0e20646bb

Merge with TAH -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Merge with TAH manifest hash: ec82cc2d7b7357fd7db4917e09d7d6865482de58 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCr+f1ywK+sNU5EO8RAuPtAJ0WilDBo3iG4S/dmIabhzYW987TtgCgkjkM 8OmatsrjG01iJAhkKJj+XnQ= =mOLr -----END PGP SIGNATURE-----
author mpm@selenic.com
date Wed, 15 Jun 2005 00:33:57 -0800
parents 55f63f3b6a54 b2293093b89e
children a1ecef497721 688d03d6997a
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
331
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
1 + mkdir test
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
2 + cd test
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
3 + echo foo
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
4 + hg init
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
5 + hg addremove
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
6 + hg commit -t 1
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
7 + hg verify
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
8 checking changesets
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
9 checking manifests
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
10 crosschecking files in changesets and manifests
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
11 checking files
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
12 1 files, 1 changesets, 1 total revisions
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
13 + cd ..
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
14 + mkdir branch
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
15 + cd branch
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
16 + hg init ../test
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
17 + hg co
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
18 + echo bar
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
19 + hg commit -t 2
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
20 + cd ../test
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
21 + hg pull ../branch
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
22 searching for changes
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
23 adding changesets
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
24 adding manifests
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
25 adding file revisions
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
26 modified 1 files, added 1 changesets and 1 new revisions
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
27 + hg verify
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
28 checking changesets
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
29 checking manifests
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
30 crosschecking files in changesets and manifests
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
31 checking files
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
32 1 files, 2 changesets, 2 total revisions
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
33 + hg co
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
34 + cat foo
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
35 foo
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
36 bar
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
37 + hg manifest
55f63f3b6a54 Add a simple testing framework
mpm@selenic.com
parents:
diff changeset
38 6f4310b00b9a147241b071a60c28a650827fb03d 644 foo