tests/test-rawcommit1.out
author mpm@selenic.com
Fri, 24 Jun 2005 22:51:39 -0800
changeset 460 6409d9a0df43
parent 444 2cdcb4beecb2
child 490 df9b77f67998
child 495 e94cebc60d96
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:
444
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
     1
+ hg -d init
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
     2
+ echo this is a1
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
     3
+ hg -d add a
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
     4
+ hg -d commit -t0 -d '0 0' -u user
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
     5
a
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
     6
+ echo this is b1
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
     7
+ hg -d add b
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
     8
+ hg -d commit -t1 -d '0 0' -u user
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
     9
b
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    10
+ hg -d manifest 1
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    11
05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    12
54837d97f2932a8194e69745a280a2c11e61ff9c 644 b
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    13
+ echo this is c1
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    14
+ hg -d rawcommit -p 1 -d '0 0' -u user -t2 c
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    15
+ hg -d manifest 2
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    16
05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    17
54837d97f2932a8194e69745a280a2c11e61ff9c 644 b
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    18
76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    19
+ hg -d parents
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    20
changeset:   2:c4ef0ef0554dff3ceade68d75539e4f208a2be0a
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    21
tag:         tip
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    22
parent:      1:3cefbe5cc27b3a068b7a6899ddff22a9874a7e69
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    23
parent:      -1:0000000000000000000000000000000000000000
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    24
manifest:    2:f5d7a10be55c91e08fbd4f527ab313aff2761fc6
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    25
user:        user
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    26
date:        Thu Jan  1 00:00:00 1970
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    27
files:       c
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    28
description:
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    29
2
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    30
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    31
+ rm b
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    32
+ hg -d rawcommit -p 2 -d '0 0' -u user -t3 b
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    33
+ hg -d manifest 3
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    34
05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    35
76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    36
+ hg -d parents
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    37
changeset:   3:923669243607c26c4c8f0c11f48c1182ce1a7aff
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    38
tag:         tip
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    39
parent:      2:c4ef0ef0554dff3ceade68d75539e4f208a2be0a
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    40
parent:      -1:0000000000000000000000000000000000000000
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    41
manifest:    3:1102cb6dde652ec2ba8cc2777e464853afa67cef
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    42
user:        user
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    43
date:        Thu Jan  1 00:00:00 1970
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    44
files:       b
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    45
description:
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    46
3
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    47
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    48
+ echo this is a22
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    49
+ hg -d rawcommit -p 3 -d '0 0' -u user -t4 a
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    50
+ hg -d manifest 4
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    51
d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    52
76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    53
+ hg -d parents
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    54
changeset:   4:2361ec7b1da5142bce1285c50f3bb2960706263d
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    55
tag:         tip
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    56
parent:      3:923669243607c26c4c8f0c11f48c1182ce1a7aff
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    57
parent:      -1:0000000000000000000000000000000000000000
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    58
manifest:    4:cf4021621d6357e928385ffeee996f87c0bf991d
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    59
user:        user
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    60
date:        Thu Jan  1 00:00:00 1970
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    61
files:       a
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    62
description:
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    63
4
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    64
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    65
+ echo this is c22
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    66
+ hg -d rawcommit -p 1 -d '0 0' -u user -t5 c
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    67
+ hg -d manifest 5
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    68
05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    69
54837d97f2932a8194e69745a280a2c11e61ff9c 644 b
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    70
3570202ceac2b52517df64ebd0a062cb0d8fe33a 644 c
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    71
+ hg -d parents
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    72
changeset:   4:2361ec7b1da5142bce1285c50f3bb2960706263d
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    73
parent:      3:923669243607c26c4c8f0c11f48c1182ce1a7aff
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    74
parent:      -1:0000000000000000000000000000000000000000
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    75
manifest:    4:cf4021621d6357e928385ffeee996f87c0bf991d
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    76
user:        user
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    77
date:        Thu Jan  1 00:00:00 1970
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    78
files:       a
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    79
description:
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    80
4
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    81
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    82
+ hg -d rawcommit -p 4 -p 5 -d '0 0' -u user -t6
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    83
+ hg -d manifest 6
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    84
d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    85
76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    86
+ hg -d parents
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    87
changeset:   6:aaf55aee7b6249fd7d4ba295d98c4492ec2740d7
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    88
tag:         tip
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    89
parent:      4:2361ec7b1da5142bce1285c50f3bb2960706263d
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    90
parent:      5:f8292b00383d88b470efcb2ea9c71409832ec9d6
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    91
manifest:    6:71c4262e09a89666ee12a92fefa12085aad53243
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    92
user:        user
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    93
date:        Thu Jan  1 00:00:00 1970
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    94
files:       
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    95
description:
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    96
6
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    97
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    98
+ hg -d rawcommit -p 6 -d '0 0' -u user -t7
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
    99
+ hg -d manifest 7
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
   100
d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
   101
76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
   102
+ hg -d parents
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
   103
changeset:   7:836ff890ac9ecb8c4b7c209b3e8b93f8805ca5f0
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
   104
tag:         tip
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
   105
parent:      6:aaf55aee7b6249fd7d4ba295d98c4492ec2740d7
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
   106
parent:      -1:0000000000000000000000000000000000000000
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
   107
manifest:    7:c15305fbac9dd3f49bffcc17d659b2d06d10b9a2
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
   108
user:        user
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
   109
date:        Thu Jan  1 00:00:00 1970
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
   110
files:       
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
   111
description:
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
   112
7
2cdcb4beecb2 Add rawcommit tests
mpm@selenic.com
parents:
diff changeset
   113