Merge with upstream -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Merge with upstream manifest hash: 78c3657547aa957be685a4d54462570eb4b5e181 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFCxFpbW7P1GVgWeRoRAqWGAKCkLQPbZpdLCBWKD+pecMtTRiu9EACfbuz4 dtHuM/86dYZ6CRqQHohJVjk= =v+Vv -----END PGP SIGNATURE-----

#!/bin/bash

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