tests/test-merge-revert2
author Martin Geisler <mg@lazybytes.net>
Sun, 13 Dec 2009 22:37:30 +0100
changeset 10064 6f30c35766d6
parent 4387 93a4e72b4f83
child 12156 4c94b6d0fb1c
permissions -rwxr-xr-x
minirst: don't test regexps twice We know the regexps match since splitparagraphs used them too.

#!/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
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