tests/test-merge5
author Giorgos Keramidas <keramida@ceid.upatras.gr>
Tue, 10 Oct 2006 21:03:24 +0300
changeset 3351 50a18815e3f0
parent 1963 39eb64b23cb5
child 3580 41989e55fa37
permissions -rwxr-xr-x
Revert changeset c67920d78248. It breaks 'hg merge && hg up -c REV' when files exist only in one of the manifests, making hg throw a traceback like:

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