tests/test-merge-revert
author Adrian Buehlmann <adrian@cadifra.com>
Sun, 12 Sep 2010 11:52:13 +0200
changeset 12259 7b05cb9ac6d2
parent 12156 4c94b6d0fb1c
permissions -rwxr-xr-x
tests: unify test-merge-prompt

#!/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"
echo "changed file1" >> file1
hg commit -m "changed file1"
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
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