Fix yet another resolve corner case
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Fix yet another resolve corner case
manifest hash: a194321b5cd718a3c31f327c5145a4ebd8dd4ef4
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCr+IvywK+sNU5EO8RAt49AJwLBBq7AZfo1WqcwZvzSVENvJGLmgCePumQ
0/9RwjL/PorsvFJi+CiFYyY=
=S6HA
-----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