tests/test-merge5
author mpm@selenic.com
Thu, 21 Jul 2005 15:05:17 -0500
changeset 749 7e4843b7efd2
parent 415 c2b9502a4e96
child 800 ec85f9e6f3b1
child 808 8f5637f0a0c0
child 814 0902ffece4b4
permissions -rwxr-xr-x
Update tests to use commit -m and default -u manifest hash: 6e4385453843031a712005a320d6000595b40d05

#!/bin/sh -x

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