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

[Dr. Arne Babenhauserheide]

Uwe Brauer <oub at mat.ucm.es> writes:

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

what do you see with `hg heads`? Is it merged?

Do you have changes in
Mini-Examen-Quim/13-14/Result-Final/CALIFICACIONES_EstadisticaCalcNumerico13-14.csv
?

Can you clone from the USB-stick?

Best wishes,
Arne
-- 
Unpolitisch sein
heißt politisch sein
ohne es zu merken
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 1125 bytes
Desc: not available
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20210605/55a65945/attachment.asc>