Mercurial > hg > mercurial-crew-with-dirclash

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line source

+ hg init
+ echo a
+ hg add a
+ hg commit -t 1 -u test -d '0 0'
+ hg status
? .out
+ cp a b
+ hg copy a b
+ hg status
A b
? .out
+ hg -d commit -t 2 -u test -d '0 0'
b
 b: copy a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
+ hg history
changeset:   1:3b5b84850bbed12e8ff8c1b87b32dc93c59ae6d8
tag:         tip
user:        test
date:        Thu Jan  1 00:00:00 1970
summary:     2

changeset:   0:c19d34741b0a4ced8e4ba74bb834597d5193851e
user:        test
date:        Thu Jan  1 00:00:00 1970
summary:     1

+ hg log a
revision:    0:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
changeset:   0:c19d34741b0a4ced8e4ba74bb834597d5193851e
user:        test
date:        Thu Jan  1 00:00:00 1970
summary:     1

+ hexdump -C .hg/data/b.d
00000000  75 01 0a 63 6f 70 79 72  65 76 3a 20 62 37 38 39  |u..copyrev: b789|
00000010  66 64 64 39 36 64 63 32  66 33 62 64 32 32 39 63  |fdd96dc2f3bd229c|
00000020  31 64 64 38 65 65 64 66  30 66 63 36 30 65 32 62  |1dd8eedf0fc60e2b|
00000030  36 38 65 33 0a 63 6f 70  79 3a 20 61 0a 01 0a 61  |68e3.copy: a...a|
00000040  0a                                                |.|
00000041
+ hg cat b
+ md5sum
60b725f10c9c85c70d97880dfe8191b3  -
+ hg cat a
+ md5sum
60b725f10c9c85c70d97880dfe8191b3  -
+ hg verify
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
2 files, 2 changesets, 2 total revisions