tests/test-conflict
author Eric Hopper <hopper@omnifarious.org>
Fri, 30 Jun 2006 08:45:52 -0700
changeset 2536 8106e477f584
parent 2283 e506c14382fd
child 4361 46280c004f22
permissions -rwxr-xr-x
Fix new tests to be better. In particular, fix webraw test to specify a date on commit to be less brittle, and fix test-oldcgi to test fetching a subdirectory of a webdir instance.

#!/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 merge 1
hg id
egrep -v ">>>|<<<" a
hg status