tests/test-conflict
author Thomas Arendsen Hein <thomas@intevation.de>
Thu, 27 Jul 2006 18:53:10 +0200
changeset 2700 de8dc25a3eeb
parent 2283 e506c14382fd
child 4361 46280c004f22
permissions -rwxr-xr-x
Backed out changeset 2ab464771b7d15c60014996d2853efc92cdb8465 - it always runs chmod - uses chmod in an unsafe way - if somebody does a clone of a repo, runs 'make tests', everything is fine, so he can assume the original repo is fine, too, but it is not.

#!/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