tests/simple-merge
author mpm@selenic.com
Thu, 26 May 2005 08:53:04 -0800
changeset 161 0b4c5cb953d9
parent 28 9f64ee817199
permissions -rw-r--r--
Simply repository locking This is a first pass at implementing repo locking. Next up, journal recovery and undo.

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