view tests/simple-merge @ 197:b388603984fc

hgweb: add view-only support -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 hgweb: add view-only support Turning on hgweb.viewonly prevents pulls. This is a good idea for machines with limited CPU/bandwidth. manifest hash: 68d1d04dad83743f3326e8b4f2e51387787f06c0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCm0tnywK+sNU5EO8RAm1fAJ9rNjWOr+e3UosFyauBSEgyie8meACeKwjc QqbfuXPLg/+TKr2HIrC3DA4= =i8Yj -----END PGP SIGNATURE-----
author mpm@selenic.com
date Mon, 30 May 2005 09:20:39 -0800
parents 9f64ee817199
children
line wrap: on
line source

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