tests/test-merge5
author Matt Mackall <mpm@selenic.com>
Mon, 24 Jul 2006 17:13:58 -0500
changeset 2659 93b765f30c07
parent 1963 39eb64b23cb5
child 3580 41989e55fa37
permissions -rwxr-xr-x
Added tag 0.9.1 for changeset 2be3001847cb18a23c403439d9e7d0ace30804e9

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