tests/simple-merge
author mpm@selenic.com
Sat, 04 Jun 2005 20:02:27 -0800
changeset 258 268bcb5a072a
parent 28 9f64ee817199
permissions -rw-r--r--
hgweb: watch changelog for changes -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hgweb: watch changelog for changes Check the mtime of the changelog for updates on each invocation of run(). For the standalone server, this means you don't need to re-run it to pick up changes. manifest hash: 398bdbf03b867df27da9e803a094dd265f62e12c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFConlTywK+sNU5EO8RAljMAKCigJKR2aXabt1kuYeiAl+PZEN1owCeKShZ oZKfo+I7e967FqI9l7NIPFE= =pTp6 -----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