tests/test-merge5
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Wed, 15 Mar 2006 07:09:42 +0100
changeset 1956 16750010813d
parent 1933 7544700fd931
child 1963 39eb64b23cb5
permissions -rwxr-xr-x
use a proper test instead of catching every exception

#!/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 "yes k" below, but it prevents
# this test from hanging when "hg update" erroneously prompts the
# user for "keep or delete"
yes k | hg update 1
# we exit with 0 to avoid the unavoidable SIGPIPE from above causing
# us to fail this test
exit 0