Mercurial > hg > mercurial-crew-with-dirclash

annotate tests/test-diffdir.out @ 566:b2c9b36bd639

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
repo.changes: fix duplicate changes -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 repo.changes: fix duplicate changes We need to discard the changed and added lists from dirstate.changes before adding to them when comparing manifests. Otherwise something that changed from rev->parent->working dir will appear twice. Bug spotted by Goffredo Baroncelli <kreijack@libero.it> manifest hash: 64c335e2fe6df6d1ce29d0903f16821c7566768f -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCxcT3ywK+sNU5EO8RAivLAJ4gqbWfMnt+BdyGac/ZGduy2KbNegCgncPV D4ay6Qw9sIodEPjRebvk3GE= =AZd2 -----END PGP SIGNATURE-----
author mpm@selenic.com
date Fri, 01 Jul 2005 14:34:31 -0800
parents cdddf4652aec
children af7e21f3b2d9
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
536
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents:
diff changeset
1 diff -r 3903775176ed b
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents:
diff changeset
2 --- /dev/null
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents:
diff changeset
3 +++ b/b
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents:
diff changeset
4 @@ -0,0 +1,1 @@
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents:
diff changeset
5 +123
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents:
diff changeset
6 diff -r 3903775176ed b
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents:
diff changeset
7 --- /dev/null
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents:
diff changeset
8 +++ b/b
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents:
diff changeset
9 @@ -0,0 +1,1 @@
c15b4bc0a11c Refactor diffrevs/diffdir into changes
mpm@selenic.com
parents:
diff changeset
10 +123
561
cdddf4652aec Fix dodiff/changes
mpm@selenic.com
parents: 536
diff changeset
11 diff -r 3903775176ed b
cdddf4652aec Fix dodiff/changes
mpm@selenic.com
parents: 536
diff changeset
12 --- /dev/null
cdddf4652aec Fix dodiff/changes
mpm@selenic.com
parents: 536
diff changeset
13 +++ b/b
cdddf4652aec Fix dodiff/changes
mpm@selenic.com
parents: 536
diff changeset
14 @@ -0,0 +1,1 @@
cdddf4652aec Fix dodiff/changes
mpm@selenic.com
parents: 536
diff changeset
15 +123