annotate tests/test-copy.out @ 460:6409d9a0df43

add dirstate debugging commands -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 add dirstate debugging commands As I've played with various different merges and more recently rawcommit, I've found the following patch to be very very helpful in figuring out whether the dirstate is being left in a consistent or inconsistent state with respect to the current manifest. I attempted to deduce the invariants that were assumed by the current code, and then check it in this code. I may or may not have captured the design intent in this check; if not, I'd be very happy to hear more clearly what was intended, so that I can write tests to that expectation. Anyway, here's the patch. Not sure if it's a good idea to commit it to the mainline, or just leave it as a debugging aid. I attempted to package it so that it doesn't interfere with normal usage. Michael Fetterman (tweaked by mpm: remove -d magic) manifest hash: 869f5b5f954dc0f46ba27322359e811d5e21d71c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCvP77ywK+sNU5EO8RArmtAKCCVuI2slANzWZ26P5edtH/ixdwNwCfZLWl 5P+V+C92II3usO4YW2MULKY= =/Pv4 -----END PGP SIGNATURE-----
author mpm@selenic.com
date Fri, 24 Jun 2005 22:51:39 -0800
parents 398737777644
children 512d76558bd4 50da4bb9cab6
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
363
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
1 + hg init
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
2 + echo a
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
3 + hg add a
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
4 + hg commit -t 1 -u test -d '0 0'
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
5 + hg status
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
6 ? .out
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
7 + cp a b
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
8 + hg copy a b
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
9 + hg status
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
10 A b
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
11 ? .out
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
12 + hg -d commit -t 2 -u test -d '0 0'
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
13 b
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
14 b: copy a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
15 + hg history
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
16 changeset: 1:3b5b84850bbed12e8ff8c1b87b32dc93c59ae6d8
388
398737777644 Fixed tests for displaying tags in hg history and hg parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 382
diff changeset
17 tag: tip
363
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
18 user: test
382
37249c522770 test suite: fix timezone problems and port collision problem
mpm@selenic.com
parents: 363
diff changeset
19 date: Thu Jan 1 00:00:00 1970
363
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
20 summary: 2
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
21
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
22 changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
23 user: test
382
37249c522770 test suite: fix timezone problems and port collision problem
mpm@selenic.com
parents: 363
diff changeset
24 date: Thu Jan 1 00:00:00 1970
363
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
25 summary: 1
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
26
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
27 + hg log a
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
28 revision: 0:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
29 changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
30 user: test
382
37249c522770 test suite: fix timezone problems and port collision problem
mpm@selenic.com
parents: 363
diff changeset
31 date: Thu Jan 1 00:00:00 1970
363
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
32 summary: 1
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
33
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
34 + hexdump -C .hg/data/b.d
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
35 00000000 75 01 0a 63 6f 70 79 72 65 76 3a 20 62 37 38 39 |u..copyrev: b789|
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
36 00000010 66 64 64 39 36 64 63 32 66 33 62 64 32 32 39 63 |fdd96dc2f3bd229c|
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
37 00000020 31 64 64 38 65 65 64 66 30 66 63 36 30 65 32 62 |1dd8eedf0fc60e2b|
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
38 00000030 36 38 65 33 0a 63 6f 70 79 3a 20 61 0a 01 0a 61 |68e3.copy: a...a|
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
39 00000040 0a |.|
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
40 00000041
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
41 + hg cat b
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
42 + md5sum
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
43 60b725f10c9c85c70d97880dfe8191b3 -
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
44 + hg cat a
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
45 + md5sum
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
46 60b725f10c9c85c70d97880dfe8191b3 -
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
47 + hg verify
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
48 checking changesets
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
49 checking manifests
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
50 crosschecking files in changesets and manifests
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
51 checking files
ae96b7e1318d Add hg copy
mpm@selenic.com
parents:
diff changeset
52 2 files, 2 changesets, 2 total revisions