[clone to a case-sensitive medium, did not help]
Brendan Barnwell
brenbarn at brenbarn.net
Fri Jun 4 18:16:09 UTC 2021
On 2021-06-04 08:41, Uwe Brauer 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"
> `----
>
> 1. From my mac disk I pull the 'repaired' repository.
>
> 2. But hg up english
>
> abort: case-folding collision between Mini-Examen-Quim/13-14/Result-Final/Calificaciones_EstadisticaCalcNumerico13-14.csv and Mini-Examen-Quim/13-14/Result-Final/CALIFICACIONES_EstadisticaCalcNumerico13-14.csv
If what you're concerned about is the data in the files, can't you just
use a case-sensitive filesystem to rename one case-version to a
completely different name and just leave it like that? That is, just do
something like your first hg mv above, renaming the file to something
completely different, and then pull that, without renaming it back to
the case-colliding name? Is it important that the file have that
particular name?
Also, if I read your error right, you are getting a collision involve a
file that no longer exists (the uppercase version, which is gone since
you renamed it to a different case). Are you sure you're making the
changes in right branch and/or updating to the right revision?
--
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