tests/test-conflict
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Tue, 25 Oct 2005 15:51:28 -0700
changeset 1447 508a3f559553
parent 814 0902ffece4b4
child 1925 c71420b186b0
permissions -rwxr-xr-x
revert added and removed files to their normal state before reverting add a test for revert

#!/bin/sh

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