tests/test-pull.out
author mpm@selenic.com
Fri, 24 Jun 2005 22:51:39 -0800
changeset 460 6409d9a0df43
parent 350 b4e0e20646bb
child 522 2f1de824798a
permissions -rw-r--r--
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-----
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
336
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
     1
checking changesets
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
     2
checking manifests
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
     3
crosschecking files in changesets and manifests
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
     4
checking files
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
     5
1 files, 1 changesets, 1 total revisions
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
     6
requesting all changes
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
     7
adding changesets
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
     8
adding manifests
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
     9
adding file revisions
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
    10
modified 1 files, added 1 changesets and 1 new revisions
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
    11
checking changesets
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
    12
checking manifests
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
    13
crosschecking files in changesets and manifests
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
    14
checking files
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
    15
1 files, 1 changesets, 1 total revisions
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
    16
foo
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
    17
2ed2a3912a0b24502043eae84ee4b279c18b90dd 644 foo
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
    18
killed!