test-merge5
21 lines
| 538 B
| text/plain
|
TextLexer
/ tests / test-merge5
|
r800 | #!/bin/sh | ||
|
r415 | |||
mkdir t | ||||
cd t | ||||
hg init | ||||
echo This is file a1 > a | ||||
echo This is file b1 > b | ||||
hg add a b | ||||
|
r1933 | hg commit -m "commit #0" -d "1000000 0" | ||
|
r415 | echo This is file b22 > b | ||
|
r1933 | hg commit -m"comment #1" -d "1000000 0" | ||
|
r415 | hg update 0 | ||
rm b | ||||
|
r1933 | hg commit -A -m"comment #2" -d "1000000 0" | ||
|
r415 | # 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 | ||||