view tests/test-casefolding @ 9815:49efeed49c94

rebase: make sure the newancestor is used during the whole update
(issue1561)

Before this change, newancestor was used only once as a replacement
for ancestor.ancestor, but merge.update calls ancestor.ancestor
several times, so it ends up with the "wrong" ancestor (the real
ancestor, but we want the parent of the rebased changeset for all but
the first rebased changeset).

Added a new test case for this: test-rebase-newancestor.

Also, in one scenario in test-rebase-collapse, there was a spurious
conflict caused by the same issue, so that test case was fixed by
removing the now unneeded conflict resolution and the output was
adapted accordingly.

#!/bin/sh

"$TESTDIR/hghave" icasefs || exit 80

echo '% test file addition with bad case'
hg init repo1
cd repo1
echo a > a
hg add A
hg st
hg ci -m adda
hg manifest
cd ..

echo '% test case collision on rename (issue 750)'
hg init repo2
cd repo2
echo a > a
hg --debug ci -Am adda
hg mv a A
# 'a' used to be removed under windows
test -f a || echo 'a is missing'
hg st
cd ..

echo '% test case collision between revisions (issue 912)'
hg init repo3
cd repo3
echo a > a
hg ci -Am adda
hg rm a
hg ci -Am removea
echo A > A
# on linux hfs keeps the old case stored, force it
mv a aa
mv aa A
hg ci -Am addA
# Used to fail under case insensitive fs
hg up -C 0
hg up -C
cd ..