test-help: hg copy now shows up in the help
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
test-help: hg copy now shows up in the help
manifest hash: f5a8f55f2e87e363c22e1639eef4a919ed028d4e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCsMCTywK+sNU5EO8RAg0UAKCtCVRkgxqjfHGIbaz1DTZ+FJgXdQCgrfkq
i4W+etRh5HWatXrjw+n7Ppk=
=4lE7
-----END PGP SIGNATURE-----
#!/bin/bash
export HGMERGE=true
set -ex
mkdir r1
cd r1
hg init
echo a > a
hg addremove
hg commit -t "1" -u test -d "0 0"
cd ..
mkdir r2
cd r2
hg init ../r1
hg up
echo abc > a
hg diff > ../d
sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d
cd ../r1
echo b > b
echo a2 > a
hg addremove
hg commit -t "2" -u test -d "0 0"
cd ../r2
hg -q pull ../r1
hg status
hg -d up
hg -d up -m
hg parents
hg -v history
hg diff > ../d
sed "s/\(\(---\|+++\).*\)\t.*/\1/" < ../d