tests/test-merge5
author Matt Mackall <mpm@selenic.com>
Mon, 31 May 2010 12:57:24 -0500
branchstable
changeset 11246 8f5ad12db28e
parent 6350 6aa4a3fa4e60
permissions -rwxr-xr-x
Merge with i18n

#!/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"
mv a c
# 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"
echo % should abort
hg update -y 1
mv c a
echo % should succeed
hg update -y 1

exit 0