tests/test-merge-revert
author Thomas Arendsen Hein <thomas@intevation.de>
Tue, 26 Dec 2006 14:17:48 +0100
changeset 3988 9dcf9d45cab8
parent 2982 890e285c52a1
child 4365 46280c004f22
permissions -rwxr-xr-x
Don't use -f for rm in tests where not needed. Drop /bin/ from /bin/rm.

#!/bin/sh

mkdir t
cd t
hg init
echo "added file1" > file1
echo "added file2" > file2
hg add file1 file2
hg commit -m "added file1 and file2" -d "1000000 0" -u user
echo "changed file1" >> file1
hg commit -m "changed file1" -d "1000000 0" -u user
hg -q log
hg id
hg update -C 0
hg id
echo "changed file1" >> file1
hg id
hg revert --all
hg diff
hg status
hg id
hg update
hg diff
hg status
hg id
hg update -C 0
echo "changed file1" >> file1
HGMERGE=merge hg update
hg diff
hg status
hg id
hg revert --all
hg diff
hg status
hg id
hg revert -r tip --all
hg diff
hg status
hg id
hg update -C
hg diff
hg status
hg id