tests/simple-merge
author mpm@selenic.com
Sun, 05 Jun 2005 10:48:39 -0800
changeset 262 3db700146536
parent 28 9f64ee817199
permissions -rw-r--r--
implement demand loading hack -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 implement demand loading hack This attempts to speed up start-up times without pushing imports down into local scopes. manifest hash: f9c18897e67f7872b44f5c89bdde00edfc3628ce -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCo0kHywK+sNU5EO8RAg5HAKCxRKAz3FXDyv4wScq1ZbwTgfPa2gCfW9K+ dg5nC3Uvp4FilP8waF6liAY= =dolF -----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