Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-rawcommit1 @ 576:da11baf5de7b
Handle unknown files better on update
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Handle unknown files better on update
If we spot an unknown file that's identical to one that's in the
update, we get the updated one so that it shows up in the dirstate
properly.
manifest hash: 988aca64f255df67c27d1c6f8694ea098e4ec159
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCxyFyywK+sNU5EO8RAjmiAKCTgINXMPB1CxHt0OgHYPucfjCS7QCcDpJJ
VgKqZS54hTAWN3jL2yllUhI=
=iPQD
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Sat, 02 Jul 2005 15:21:22 -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