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 -ex
mkdir test
cd test
echo foo>foo
hg init
hg addremove
hg commit -t "1"
hg verify
cd ..
mkdir branch
cd branch
hg init ../test
hg co
echo bar>>foo
hg commit -t "2"
cd ../test
hg pull ../branch
hg verify
hg co
cat foo
hg manifest