Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-flags.out @ 460:6409d9a0df43

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line source

pulling from ../test1
requesting all changes
adding changesets
adding manifests
adding file revisions
modified 2 files, added 1 changesets and 2 new revisions
(run 'hg update' to get a working copy)
pulling from ../test2
searching for changes
adding changesets
adding manifests
adding file revisions
modified 1 files, added 1 changesets and 1 new revisions
(run 'hg update' to get a working copy)
changeset:   2:3ef54330565526bebf37a0d9bf540c283fd133a1
tag:         tip
parent:      0:22a449e20da501ca558394c083ca470e9c81b9f7
user:        test
date:        Thu Jan  1 00:00:00 1970
summary:     chmod +x a

changeset:   1:c6ecefc45368ed556d965f1c1086c6561a8b2ac5
user:        test
date:        Thu Jan  1 00:00:00 1970
summary:     a updated

changeset:   2:3ef54330565526bebf37a0d9bf540c283fd133a1
tag:         tip
parent:      0:22a449e20da501ca558394c083ca470e9c81b9f7
user:        test
date:        Thu Jan  1 00:00:00 1970
summary:     chmod +x a

changeset:   1:c6ecefc45368ed556d965f1c1086c6561a8b2ac5
user:        test
date:        Thu Jan  1 00:00:00 1970
summary:     a updated

changeset:   0:22a449e20da501ca558394c083ca470e9c81b9f7
user:        test
date:        Thu Jan  1 00:00:00 1970
summary:     added a b

resolving manifests
 ancestor f328b97f7c11 local e7f06daf1cdb remote 629f0b785e0e
 a versions differ, resolve
merging a
resolving a
file a: other 37c42bd6cc03 ancestor b80de5d13875
-rwxr-xr-x
-rwxr-xr-x