tests/test-merge-revert
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Mon, 17 Jul 2006 02:09:35 +0200
changeset 2654 9bd3d44c32f6
parent 1933 7544700fd931
child 2965 890e285c52a1
permissions -rwxr-xr-x
fix 'hg cat' broken by 156fb1feab62

#!/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
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
hg diff
hg status
hg id
hg revert -r tip
hg diff
hg status
hg id
hg update -C
hg diff
hg status
hg id
cd ..; /bin/rm -rf t