tests/test-conflict
author Stephen Darnell <stephen@darnell.plus.com>
Thu, 27 Apr 2006 21:59:44 -0700
changeset 2144 d3bddedfdbd0
parent 1933 7544700fd931
child 2283 e506c14382fd
permissions -rwxr-xr-x
Add code coverage to the python version of run-tests (inc. annotation) Also include a minor work-around to coverage.py to avoid errors about /<string>

#!/bin/sh

hg init
echo "nothing" > a
hg add a
hg commit -m ancestor -d "1000000 0"
echo "something" > a
hg commit -m branch1 -d "1000000 0"
hg co 0
echo "something else" > a
hg commit -m branch2 -d "1000000 0"
HGMERGE=merge; export HGMERGE
hg up -m 1
hg id
egrep -v ">>>|<<<" a
hg status