tests/test-merge5
author TK Soh <teekaysoh@yahoo.com>
Mon, 28 Aug 2006 16:30:48 -0500
changeset 3071 be98c5ce4022
parent 1963 39eb64b23cb5
child 3580 41989e55fa37
permissions -rwxr-xr-x
extdiff: do not shell-quote options to new commands revert a change introduced by 453097750fbf

#!/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 "-y" below, but it prevents
# this test from hanging when "hg update" erroneously prompts the
# user for "keep or delete"
hg update -y 1

exit 0