[issue2869] Update fails with case-folding issue when file with different case added on multiple branches which are then merged

[Aaron Jensen]

New submission from Aaron Jensen <ajensen at webmd.net>:

Yesterday, we started getting another case-folding error when we try to update our 
working directories.  If you add a file in multiple branches with different cases, 
when you merge from one branch into the other, nobody else can update past the 
merge due to a case-folding problem.

We are on Windows 7 and Windows 2008.
Mercurial 1.8.3

# Steps to Reproduce

hg init CaseFold
cd CaseFold
echo "" > FirstFile.txt
hg add FirstFile.txt
hg commit -m "Adding first file."
cd ..\
hg clone --pull CaseFold CaseFoldClone
cd CaseFold
hg branch Release
echo "" > HELLO.txt
hg add HELLO.txt
hg commit -m "Adding HELLO.txt"
hg update default
echo "" > hello.txt
hg add hello.txt
hg commit -m "Adding hello.txt"
hg merge Release
cd ..\CaseFoldClone
hg pull
hg update

After the last command, we get the following error:
> abort: case-folding collision between hello.txt and HELLO.txt

----------
messages: 16606
nosy: splatteredbits
priority: critical
status: unread
title: Update fails with case-folding issue when file with different case added on multiple branches which are then merged

____________________________________________________
Mercurial issue tracker <bugs at mercurial.selenic.com>
<http://mercurial.selenic.com/bts/issue2869>
____________________________________________________