tests/simple-merge
author mpm@selenic.com
Tue, 31 May 2005 22:45:50 -0800
changeset 206 3295b6b508de
parent 28 9f64ee817199
permissions -rw-r--r--
hg: don't complain about missing repo with no args -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hg: don't complain about missing repo with no args manifest hash: d8172c0b583d6f2ff60cf49e74c1247de8d9d673 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCnVmeywK+sNU5EO8RAj79AJ4wN1SwC8+e1amxv+EAd6VKhpXXYgCeIPDK iVX9Z0Ix8DiC3p8fquyhFwM= =c6EH -----END PGP SIGNATURE-----

set -ex
export EDITOR=true
rm -rf test branch

mkdir test
cd test
echo foo>foo
hg init
hg addremove
hg commit
hg verify
cd ..

cp -a test branch
cd branch
echo bar>>foo
hg commit

cd ../test
hg merge ../branch
hg verify