case fold extension

Brendan Barnwell brenbarn at brenbarn.net
Sun Jun 6 19:00:25 UTC 2021


On 2021-06-06 00:34, Uwe Brauer wrote:
>
> Hi
>
> After my experience of the last days, I am looking for extension that
> might be useful in the context of case conflicts.

	I still don't fully understand the nature of your problem.  Based on 
what you said in the other thread, what eventually worked was pretty 
much exactly what's suggested at: 
https://book.mercurial-scm.org/read/files.html#detecting-case-conflicts 
(which you already linked to in the other thread) .  The problem was 
that you were renaming files around in one branch and expecting that to 
affect another branch, or you were renaming files and expecting that to 
fix older revisions from before you renamed them.  But as described on 
that page, that's not how the fix works; by renaming files you create a 
NEW revision with the case fixed, and you need to update to that 
revision (on the right branch) to see the fix.

	If you have a case conflict, and you follow the instructions given by 
Arne Babenhauserheide (on a linux box: switch to the branch, hg mv the 
files to non-colliding names, commit, then pull to your windows machine 
and update to the newly-fixed revision), then as far as I can tell 
everything is fine.  You haven't lost any data.  You still have all your 
files.  The only thing that has changed is that some files now have 
different names.

	It's true you still cannot, on the windows machine, update to a 
particular old revision where there was a name collision, but what is 
the problem with that?  If you need to fix the case collision on many 
old revisions because you need to see those old revisions, you can do 
the same procedure repeatedly, creating new case-fixed versions of any 
old revisions you need.  It seems somewhat unusual to me that you would 
have a large number of revisions with a case-fold error but still need 
to be able to update to every one of those revisions.

	So what exactly is the problem you're hoping an extension will solve?

-- 
Brendan Barnwell
"Do not follow where the path may lead.  Go, instead, where there is no 
path, and leave a trail."
    --author unknown



More information about the Mercurial mailing list