view tests/simple-merge @ 158:be7103467d2e

Add 'hg serve' command for stand-alone server

This adds a simple stand-alone web server mode to hg that exports the
current repo for merging and browsing. The default port is 8000.

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