tests/test-simple-update

Merge with TAH

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Merge with TAH

manifest hash: ec82cc2d7b7357fd7db4917e09d7d6865482de58
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCr+f1ywK+sNU5EO8RAuPtAJ0WilDBo3iG4S/dmIabhzYW987TtgCgkjkM
8OmatsrjG01iJAhkKJj+XnQ=
=mOLr
-----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