Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-tags.out @ 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 | cdddf4652aec |
children | c5df1a9c5276 |
line wrap: on
line source
+ mkdir t + cd t + hg init + hg id unknown + echo a + hg add a + hg commit -t test -u test -d '0 0' + hg co + hg identify acb14030fe0a tip ++ hg -q tip ++ cut -d : -f 2 + T=acb14030fe0a21b60322c440ad2d20cf7685a376 + echo 'acb14030fe0a21b60322c440ad2d20cf7685a376 first' + cat .hgtags acb14030fe0a21b60322c440ad2d20cf7685a376 first + hg add .hgtags + hg commit -t 'add tags' -u test -d '0 0' + hg tags tip 1:b9154636be938d3d431e75a7c906504a079bfe07 first 0:acb14030fe0a21b60322c440ad2d20cf7685a376 + hg identify b9154636be93 tip + echo bb + hg status C a + hg identify b9154636be93+ tip + hg co first + hg id acb14030fe0a+ first + hg -v id acb14030fe0a21b60322c440ad2d20cf7685a376+ first + hg status C a + echo 1 + hg add b + hg commit -t branch -u test -d '0 0' + hg id c8edf04160c7 tip + hg co -m 1 + hg id c8edf04160c7+b9154636be93+ tip + hg status C .hgtags C a