Occasional case-folding error when trying to transplant or graft
JohnRenstrom
John.Renstrom at HexagonMetrology.com
Mon Jan 16 17:46:16 CST 2012
We've been using Mercurial for several years at my company and every once in
a while we will get that painful case-folding scenario; By using some custom
hooks on push we have been able to catch these problems before they get
pushed out to the main repository which has dramatically improved our down
time. Now it is just a local issue that one developer must resolve before
his changeset can be pushed to the server.
We still bump into occasional case-folding issues with transplant/graft and
today while I was examining one of these issues I may have stumbled onto a
reason why they seem to come and go so randomly.
*My Theory:*
Although Windows is a case-insensitive OS it does still preserve case; I
noticed today that the same file had been added to two different branches:
Branch 1: 'Filename.txt'
Branch 2: 'FILENAME.TXT' (All Uppercase)
I do not have a good explanation as to why/how the same file has different
case between the two branches because it is very likely that it was
transplanted/grafted to that second branch but nonetheless, it is different
case and helps to demonstrate what I noticed today...
When I went to transplant a changeset (A changeset that didn't even include
this file) to a third branch I bumped into a case-folding error because my
local file was not matching the required case given the branch I was updated
to. Upon further investigation, I suspect that when I rolled from one
branch to the other Windows saw this file as already existing and Mercurial
may have simply modified the contents of file within the already existing
filename which was initially generated on my local drive from the first
branch leaving me with a local file whose case sis not match the correct
case for the branch I just updated to...
I'm reporting this information in hopes that it may help others to better
understand why they get unexplained case-folding errors; I am also
optimistic that this will aid in the diagnosis and fix for this issue in
Mercurial.
--
View this message in context: http://mercurial.808500.n3.nabble.com/Occasional-case-folding-error-when-trying-to-transplant-or-graft-tp3664778p3664778.html
Sent from the Development mailing list archive at Nabble.com.
More information about the Mercurial-devel
mailing list