Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-flags @ 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 | e94cebc60d96 |
children | eb46971fc57f |
line wrap: on
line source
#!/bin/sh -ex umask 027 mkdir test1 cd test1 hg init touch a b hg add a b hg ci -t "added a b" -u test -d "0 0" cd .. mkdir test2 cd test2 hg init hg pull ../test1 hg co chmod +x a hg ci -t "chmod +x a" -u test -d "0 0" cd ../test1 echo 123 >>a hg ci -t "a updated" -u test -d "0 0" hg pull ../test2 hg heads hg history hg -dv co -m ls -l ../test[12]/a > foo cut -b 0-10 < foo