tests/simple-merge
author mpm@selenic.com
Sat, 04 Jun 2005 14:25:08 -0800
changeset 250 45ee7c4cae4f
parent 28 9f64ee817199
permissions -rw-r--r--
Catch broken pipes in command interpreter -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Catch broken pipes in command interpreter manifest hash: b1550ec705836af571bf0c0921d9e768ac5e5e80 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCoipEywK+sNU5EO8RAg2WAKCu3NUArYzOX2UwGj8pv3AnDQCwoQCffPWk RcaNt0+COwST2FlbQQOxEk8= =jbZG -----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