[clone to a case-sensitive medium, did not help] (was: [Situation gets worse])

[Dr Rainer Woitok]

Uwe,

On Friday, 2021-06-04 17:41:55 +0200, you wrote:

> ...
> It took me some time to format a USB with HFS+ case sensitve and
> journaling disabled.
> 
>     1. I switched to that medium,
> 
>     2. I checked that it is case sensitive.
> 
>     3. I cloned the repository.
> 
>     4. I run Rainer's recomendations:
> 
> ,----
> | hg mv Mini-Examen-Quim/13-14/Result-Final/CALIFICACIONES_EstadisticaCalcNumerico13-14.csv Mini-Examen-Quim/13-14/Result-Final/steve
> | hg ci -m "First move"
> | hg mv Mini-Examen-Quim/13-14/Result-Final/steve Mini-Examen-Quim/13-14/Result-Final/Calificaciones_EstadisticaCalcNumerico13-14.csv 
> | hg ci -m "Second move"
> `----

Strictly speaking,  on a case respecting file system you could have done
this with a single  "hg mv" command  because files  "*/Calificaciones_*"
and "*/CALIFICACIONES_*" are different files due to their dirrerent nam-
es.

>    1. From my mac disk I pull the 'repaired' repository.
> 
>    2. But hg up english 

I'm still  not quite sure  what precisely  your problem is.   Is there a
file  "*/Calificaciones_*"  in branch  "default"  while there  is a file
"*/CALIFICACIONES_*" in branch "english" (or vice versa)?   In that case
"hg up -C english"  might help  because it would  remove the conflicting
file in branch "default" from the working directory  before checking out
branch "english".

But since thanks to Bill Gates -- and as I was supprised to learn lately
also Steve Jobs  -- the vast majority  of file systems  in this world is
case agnostic, I'd say that having different files in different branches
with names only differing in case  generally is a BAD IDEA (tm).   Can't
you rather put  ".gb" or ".en"  in the conflicting file names  in branch
"english"?  Then case would again be irrelevant.

Sincerely,
  Rainer