tests/simple-merge
author mpm@selenic.com
Wed, 25 May 2005 16:21:06 -0800
changeset 157 2653740d8118
parent 28 9f64ee817199
permissions -rw-r--r--
Install the templates where they can be found by hgweb.py This ought to use package_data but that doesn't exist in Python 2.3. So we do a hack of install_data and use glob. This also adds templatepath() to hgweb.py which finds the templates relative to hgweb.py's location.

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