Mercurial > hg > mercurial-crew-with-dirclash
view 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 |
line wrap: on
line source
#!/bin/sh -x hg -d init echo this is a1 > a hg -d add a hg -d commit -t0 -d "0 0" -u user echo this is b1 > b hg -d add b hg -d commit -t1 -d "0 0" -u user hg -d manifest 1 echo this is c1 > c hg -d rawcommit -p 1 -d "0 0" -u user -t2 c hg -d manifest 2 hg -d parents rm b hg -d rawcommit -p 2 -d "0 0" -u user -t3 b hg -d manifest 3 hg -d parents echo this is a22 > a hg -d rawcommit -p 3 -d "0 0" -u user -t4 a hg -d manifest 4 hg -d parents echo this is c22 > c hg -d rawcommit -p 1 -d "0 0" -u user -t5 c hg -d manifest 5 hg -d parents # merge, but no files changed hg -d rawcommit -p 4 -p 5 -d "0 0" -u user -t6 hg -d manifest 6 hg -d parents # no changes what-so-ever hg -d rawcommit -p 6 -d "0 0" -u user -t7 hg -d manifest 7 hg -d parents