hg merge: fix time asymmetry bug with deleting files on update to past -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg merge: fix time asymmetry bug with deleting files on update to past manifest hash: 41feb7bf9b56e071a538a0918224898acb2bd31c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCsm6XywK+sNU5EO8RAncbAKCwn/W4cr6civp4Zt79JFH6um0/lQCdFCh8 F7ZOQ+S/PL3HL4iE6avOBDc= =kHPm -----END PGP SIGNATURE-----

#!/bin/bash

set -x
mkdir t
cd t
hg init
hg id
echo a > a
hg add a
hg commit -t "test" -u test -d "0 0"
hg co
hg identify
T=`hg -q tip | cut -d : -f 2`
echo "$T first" > .hgtags
cat .hgtags
hg add .hgtags
hg commit -t "add tags" -u test -d "0 0"
hg tags
hg identify
echo bb > a
hg status
hg identify
hg co first
hg id
hg -v id
hg status
echo 1 > b
hg add b
hg commit -t "branch" -u test -d "0 0"
hg id
hg co -m 1
hg id
hg status