tests/test-conflict
author Vadim Gelfer <vadim.gelfer@gmail.com>
Fri, 31 Mar 2006 10:37:25 -0800
changeset 2029 d436b21b20dc
parent 1933 7544700fd931
child 2283 e506c14382fd
permissions -rwxr-xr-x
rewrite revert command. fix issues 93, 123, 147. new version does these things: - saves backup copies of modified files (issue 147) - prints output like other commands, and errors when files not found (issue 123) - marks files added/removed (issue 93)

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