Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-rawcommit1 @ 566:b2c9b36bd639
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 | 2cdcb4beecb2 |
| children | eb46971fc57f |
| rev | line source |
|---|---|
| 444 | 1 #!/bin/sh -x |
| 2 hg -d init | |
| 3 echo this is a1 > a | |
| 4 hg -d add a | |
| 5 hg -d commit -t0 -d "0 0" -u user | |
| 6 echo this is b1 > b | |
| 7 hg -d add b | |
| 8 hg -d commit -t1 -d "0 0" -u user | |
| 9 hg -d manifest 1 | |
| 10 echo this is c1 > c | |
| 11 hg -d rawcommit -p 1 -d "0 0" -u user -t2 c | |
| 12 hg -d manifest 2 | |
| 13 hg -d parents | |
| 14 rm b | |
| 15 hg -d rawcommit -p 2 -d "0 0" -u user -t3 b | |
| 16 hg -d manifest 3 | |
| 17 hg -d parents | |
| 18 echo this is a22 > a | |
| 19 hg -d rawcommit -p 3 -d "0 0" -u user -t4 a | |
| 20 hg -d manifest 4 | |
| 21 hg -d parents | |
| 22 echo this is c22 > c | |
| 23 hg -d rawcommit -p 1 -d "0 0" -u user -t5 c | |
| 24 hg -d manifest 5 | |
| 25 hg -d parents | |
| 26 # merge, but no files changed | |
| 27 hg -d rawcommit -p 4 -p 5 -d "0 0" -u user -t6 | |
| 28 hg -d manifest 6 | |
| 29 hg -d parents | |
| 30 # no changes what-so-ever | |
| 31 hg -d rawcommit -p 6 -d "0 0" -u user -t7 | |
| 32 hg -d manifest 7 | |
| 33 hg -d parents |