view tests/test-merge5 @ 1453:6fbb13b7a59f

get command defaults from hgrc
author TK Soh <>
date Wed, 26 Oct 2005 16:10:36 -0700
parents 0902ffece4b4
children 7544700fd931
line wrap: on
line source


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 "0 0"
echo This is file b22 > b
hg commit -m"comment #1" -d "0 0"
hg update 0
rm b
hg commit -A -m"comment #2" -d "0 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