tests/test-bad-pull.out
author mpm@selenic.com
Fri, 24 Jun 2005 22:51:39 -0800
changeset 460 6409d9a0df43
parent 395 fbe8834923c5
child 503 c6a2e41c8c60
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:
395
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
     1
requesting all changes
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
     2
adding changesets
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
     3
abort: error 111: Connection refused
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
     4
transaction abort!
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
     5
rollback completed
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
     6
checking changesets
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
     7
checking manifests
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
     8
crosschecking files in changesets and manifests
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
     9
checking files
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
    10
0 files, 0 changesets, 0 total revisions
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
    11
cat: foo: No such file or directory
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
    12
requesting all changes
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
    13
adding changesets
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
    14
abort: HTTP Error 404: File not found
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
    15
transaction abort!
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
    16
rollback completed
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
    17
checking changesets
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
    18
checking manifests
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
    19
crosschecking files in changesets and manifests
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
    20
checking files
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
    21
0 files, 0 changesets, 0 total revisions
fbe8834923c5 commands: report http exceptions nicely
mpm@selenic.com
parents:
diff changeset
    22
cat: foo: No such file or directory