view tests/test-merge5 @ 9750:f153af9580fe

merge: first part of fix for issue1327

When there are no renames involved, we shortcut to the changeset
ancestor. This resolves most cases.

Note that Mercurial's rename philosophy elsewhere is that a file's
name is signficant and rename data is only consulted when a file of
the same name is absent.

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