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-----

     1

+ mkdir t

     2

+ cd t

     3

+ hg init

     4

+ hg id

     5

unknown

     6

+ echo a

     7

+ hg add a

     8

+ hg commit -t test -u test -d '0 0'

     9

+ hg co

    10

+ hg identify

    11

acb14030fe0a tip

    12

++ hg -q tip

    13

++ cut -d : -f 2

    14

+ T=acb14030fe0a21b60322c440ad2d20cf7685a376

    15

+ echo 'acb14030fe0a21b60322c440ad2d20cf7685a376 first'

    16

+ cat .hgtags

    17

acb14030fe0a21b60322c440ad2d20cf7685a376 first

    18

+ hg add .hgtags

    19

+ hg commit -t 'add tags' -u test -d '0 0'

    20

+ hg tags

    21

tip                                1:b9154636be938d3d431e75a7c906504a079bfe07

    22

first                              0:acb14030fe0a21b60322c440ad2d20cf7685a376

    23

+ hg identify

    24

b9154636be93 tip

    25

+ echo bb

    26

+ hg status

    27

C a

    28

+ hg identify

    29

b9154636be93+ tip

    30

+ hg co first

    31

+ hg id

    32

acb14030fe0a+ first

    33

+ hg -v id

    34

acb14030fe0a21b60322c440ad2d20cf7685a376+ first

    35

+ hg status

    36

C a

    37

+ echo 1

    38

+ hg add b

    39

+ hg commit -t branch -u test -d '0 0'

    40

+ hg id

    41

c8edf04160c7 tip

    42

+ hg co -m 1

    43

+ hg id

    44

c8edf04160c7+b9154636be93+ tip

    45

+ hg status

    46

C a

    47

C .hgtags