tests/test-merge5
author bos@serpentine.internal.keyresearch.com
Thu, 01 Sep 2005 09:08:21 -0700
changeset 1191 77a0c7528c2f
parent 814 0902ffece4b4
child 1933 7544700fd931
permissions -rwxr-xr-x
Revert changeset 120aa5fc7ced1bf765b4f025f5a3a138cd87f49e. I inadvertantly used "hg import" on a message I saved, expecting it to do the right thing, but instead it made the commit look like I authored it, and filled the description with the email header. Changeset 737f9b90c571b3991f7e35dc846e7ef38a475cfe contains a guard against "hg import" doing this again.

#!/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 "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