tests/test-update-reverse
author Steve Borho <steve@borho.org>
Wed, 06 Feb 2008 20:32:06 -0600
changeset 6075 63e0e57ab157
parent 1933 7544700fd931
child 12156 4c94b6d0fb1c
permissions -rwxr-xr-x
filemerge: add 'checkchanged' merge tool property

#!/bin/sh

hg init
touch a
hg add a
hg commit -m "Added a" -d "1000000 0"

touch main
hg add main
hg commit -m "Added main" -d "1000000 0"
hg checkout 0

echo Main should be gone
ls

touch side1
hg add side1
hg commit -m "Added side1" -d "1000000 0"
touch side2
hg add side2
hg commit -m "Added side2" -d "1000000 0"

hg log

echo Should have two heads, side2 and main
hg heads

echo Should show "a side1 side2"
ls

hg update --debug -C 1
echo Should only show "a main"
ls