tests/test-merge-revert
author Thomas Arendsen Hein <thomas@intevation.de>
Fri, 29 Jul 2005 15:59:10 +0100
changeset 802 69db1e34378b
parent 800 ec85f9e6f3b1
child 808 8f5637f0a0c0
permissions -rwxr-xr-x
Allow tests for not yet fixed bugs to fail without generating error diff.

#!/bin/sh
# FIXME: This test may fail due to an uncritical bug in Mercurial.

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 "0 0" -u user
echo "changed file1" >> file1
hg commit -m "changed file1" -d "0 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