tests/test-merge-revert2
author Thomas Arendsen Hein <thomas@intevation.de>
Thu, 19 Apr 2007 13:04:26 +0200
changeset 4364 97962a3e73cf
parent 4361 46280c004f22
child 4385 93a4e72b4f83
permissions -rwxr-xr-x
Work around problem where 'del os.environ["FOO"]' doesn't update environment. test-hook failed since changeset 949516072388 because of this on Solaris 8.

#!/bin/sh

mkdir t
cd t
hg init
echo "added file1" > file1
echo "another line of text" >> 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 --no-backup --all
hg diff
hg status
hg id
hg update
hg diff
hg status
hg id
hg update -C 0
echo "changed file1 different" >> file1
hg update
hg diff --nodates | sed -e "s/\(<<<<<<<\) .*/\1/" -e "s/\(>>>>>>>\) .*/\1/"
hg status
hg id
hg revert --no-backup --all
hg diff
hg status
hg id
hg revert -r tip --no-backup --all
hg diff
hg status
hg id
hg update -C
hg diff
hg status
hg id