Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-flags.out @ 460:6409d9a0df43
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-----
author | mpm@selenic.com |
---|---|
date | Fri, 24 Jun 2005 22:51:39 -0800 |
parents | 291a62848f54 |
children | 66eb9905d0a2 e94cebc60d96 |
rev | line source |
---|---|
412 | 1 pulling from ../test1 |
2 requesting all changes | |
3 adding changesets | |
4 adding manifests | |
5 adding file revisions | |
6 modified 2 files, added 1 changesets and 2 new revisions | |
7 (run 'hg update' to get a working copy) | |
8 pulling from ../test2 | |
9 searching for changes | |
10 adding changesets | |
11 adding manifests | |
12 adding file revisions | |
13 modified 1 files, added 1 changesets and 1 new revisions | |
14 (run 'hg update' to get a working copy) | |
15 changeset: 2:3ef54330565526bebf37a0d9bf540c283fd133a1 | |
16 tag: tip | |
17 parent: 0:22a449e20da501ca558394c083ca470e9c81b9f7 | |
18 user: test | |
19 date: Thu Jan 1 00:00:00 1970 | |
20 summary: chmod +x a | |
21 | |
22 changeset: 1:c6ecefc45368ed556d965f1c1086c6561a8b2ac5 | |
23 user: test | |
24 date: Thu Jan 1 00:00:00 1970 | |
25 summary: a updated | |
26 | |
27 changeset: 2:3ef54330565526bebf37a0d9bf540c283fd133a1 | |
28 tag: tip | |
29 parent: 0:22a449e20da501ca558394c083ca470e9c81b9f7 | |
30 user: test | |
31 date: Thu Jan 1 00:00:00 1970 | |
32 summary: chmod +x a | |
33 | |
34 changeset: 1:c6ecefc45368ed556d965f1c1086c6561a8b2ac5 | |
35 user: test | |
36 date: Thu Jan 1 00:00:00 1970 | |
37 summary: a updated | |
38 | |
39 changeset: 0:22a449e20da501ca558394c083ca470e9c81b9f7 | |
40 user: test | |
41 date: Thu Jan 1 00:00:00 1970 | |
42 summary: added a b | |
43 | |
44 resolving manifests | |
45 ancestor f328b97f7c11 local e7f06daf1cdb remote 629f0b785e0e | |
46 a versions differ, resolve | |
47 merging a | |
48 resolving a | |
49 file a: other 37c42bd6cc03 ancestor b80de5d13875 | |
50 -rwxr-xr-x | |
51 -rwxr-xr-x |