Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-simple-update @ 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 | 4fc63e22b1fe |
children | 7e4843b7efd2 |
line wrap: on
line source
#!/bin/sh set -ex mkdir test cd test echo foo>foo hg init hg addremove hg commit -t "1" hg verify hg clone . ../branch cd ../branch hg co echo bar>>foo hg commit -t "2" cd ../test hg pull ../branch hg verify hg co cat foo hg manifest