tests/test-merge5
author Thomas Arendsen Hein <thomas@intevation.de>
Wed, 13 Jun 2007 08:24:40 +0200
changeset 4565 8b87bd4fb7ce
parent 3592 fffc8a733bf9
permissions -rwxr-xr-x
Correct tests/test-patchbomb* files: mv test-patchbomb test-patchbomb.out hg revert -r 1cf908c00479 test-patchbomb

#!/bin/sh

mkdir t
cd t
hg init
echo This is file a1 > a
echo This is file b1 > b
hg add a b
hg commit -m "commit #0" -d "1000000 0"
echo This is file b22 > b
hg commit -m"comment #1" -d "1000000 0"
hg update 0
rm b
hg commit -A -m"comment #2" -d "1000000 0"
# in theory, we shouldn't need the "-y" below, but it prevents
# this test from hanging when "hg update" erroneously prompts the
# user for "keep or delete"
hg update -y 1

exit 0