case fold extension

Uwe Brauer oub at mat.ucm.es
Mon Jun 7 07:57:48 UTC 2021


>>> "BB" == Brendan Barnwell <brenbarn at brenbarn.net> writes:

> 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.

Right, the basic problem was that I read too many articles in too short
a time. Some documents talked about solving the problem my using
debugsetparents  and friends (but this was only for private
repositories).
Then there was the casefold extension which seemed to make it possible
to update to any change set even on a case-insensitive file system.

But you are right the above link state clearly that even with the fix
you describe you cannot checkout all changesets, and this part I did not
notice. My bad.


Now I fixed somehow the problem in the sense that I can access the
branch I need but not all its changesets. For this I need to reformat
the hard disk on my Mac.

> 	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.


Right


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


 Well the documentation of that extension 
https://www.mercurial-scm.org/wiki/CaseFoldExtension
states that 

 hg update --fold -r changeset

Is possible, that is what I would like to have.

In any case the cleanest way is to reformat the hard disk.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 5673 bytes
Desc: not available
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20210607/d6f30e83/attachment.p7s>


More information about the Mercurial mailing list