tests/test-pull
author mpm@selenic.com
Fri, 24 Jun 2005 22:51:39 -0800
changeset 460 6409d9a0df43
parent 392 ee4c80d294e5
child 485 c5705ab9cebd
permissions -rwxr-xr-x
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
#!/bin/bash
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
     2
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
     3
mkdir test
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
     4
cd test
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
     5
echo foo>foo
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
     6
hg init
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
     7
hg addremove
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
     8
hg commit -t "1"
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
     9
hg verify
382
37249c522770 test suite: fix timezone problems and port collision problem
mpm@selenic.com
parents: 350
diff changeset
    10
hg serve -p 20059 2>/dev/null &
336
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
    11
cd ..
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
    12
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
    13
mkdir copy
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
    14
cd copy
382
37249c522770 test suite: fix timezone problems and port collision problem
mpm@selenic.com
parents: 350
diff changeset
    15
hg init http://localhost:20059/
336
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
    16
hg verify
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
    17
hg co
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
    18
cat foo
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
    19
hg manifest
aa6cbde09f72 Add some more tests
mpm@selenic.com
parents:
diff changeset
    20
392
ee4c80d294e5 Tidy up conflict and pull tests
mpm@selenic.com
parents: 382
diff changeset
    21
kill %hg