[clone to a case-sensitive medium, did not help]

[Uwe Brauer]

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


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

The english branch should not be merged into default.

Since I use topics, I have quite some heads 
some in fact I don't understand. I use <-- to indicate my comments

<-- what the heck happened here: critical?

changeset:   350:7332d56ada58 <---relevant change set of the default branch
tag:         tip
topic:       examen-mayo
user:        Uwe Brauer <oub at mat.ucm.es>
date:        Sat Jun 05 08:50:24 2021 +0200
summary:     Rename case collision file

changeset:   349:7862856b2217 <-- what the heck happened here: critical?
remote branch:  repair/default
user:        Uwe Brauer <oub at mat.ucm.es>
date:        Fri Jun 04 17:35:58 2021 +0200
summary:     Second move

changeset:   329:9c90c7ecd39b <-- the one I want to visit
branch:      english
remote branch:  repair/english
user:        Uwe Brauer <oub at mat.ucm.es>
date:        Sat May 29 11:44:46 2021 +0200
summary:     Finish Exam English

changeset:   205:f1a4d61ffa24 <--not relevant
branch:      year-2020-21
remote branch:  local/year-2020-21
remote branch:  repair/year-2020-21
user:        Uwe Brauer <oub at mat.ucm.es>
date:        Fri Mar 19 11:54:21 2021 +0100
summary:     Typos

changeset:   195:65f6d58ccf10  <--not relevant
branch:      year-2019-20
remote branch:  local/year-2019-20
remote branch:  repair/year-2019-20
user:        Uwe Brauer <oub at mat.ucm.es>
date:        Wed Jul 01 21:30:39 2020 +0200
summary:     Finsh marks published for online control exam

changeset:   184:ffac505f119b  <--not relevant
branch:      year-2018-19
tag:         examjul19
tag:         examjun19
tag:         vs1
remote branch:  local/year-2018-19
remote branch:  repair/year-2018-19
user:        Uwe Brauer <oub at mat.ucm.es>
date:        Fri May 24 10:35:12 2019 +0200
summary:     Add exam control 2.

changeset:   177:24cf4af74eb7  <-- what the heck happened here: critical?
changeset:   350:7332d56ada58
tag:         tip
topic:       examen-mayo
user:        Uwe Brauer <oub at mat.ucm.es>
date:        Sat Jun 05 08:50:24 2021 +0200
summary:     Rename case collision file

changeset:   349:7862856b2217  <-- what the heck happened here
remote branch:  repair/default
user:        Uwe Brauer <oub at mat.ucm.es>
date:        Fri Jun 04 17:35:58 2021 +0200
summary:     Second move

changeset:   329:9c90c7ecd39b <-- what the heck happened here: critical?
branch:      english
remote branch:  repair/english
user:        Uwe Brauer <oub at mat.ucm.es>
date:        Sat May 29 11:44:46 2021 +0200
summary:     Finish Exam English

changeset:   205:f1a4d61ffa24 <--another head on that branch
branch:      year-2020-21
remote branch:  local/year-2020-21
remote branch:  repair/year-2020-21
user:        Uwe Brauer <oub at mat.ucm.es>
date:        Fri Mar 19 11:54:21 2021 +0100
summary:     Typos

changeset:   195:65f6d58ccf10
branch:      year-2019-20
remote branch:  local/year-2019-20
remote branch:  repair/year-2019-20
user:        Uwe Brauer <oub at mat.ucm.es>
date:        Wed Jul 01 21:30:39 2020 +0200
summary:     Finsh marks published for online control exam

changeset:   184:ffac505f119b
branch:      year-2018-19
tag:         examjul19
tag:         examjun19
tag:         vs1
remote branch:  local/year-2018-19
remote branch:  repair/year-2018-19
user:        Uwe Brauer <oub at mat.ucm.es>
date:        Fri May 24 10:35:12 2019 +0200
summary:     Add exam control 2.

changeset:   177:24cf4af74eb7
branch:      year-2018-19
tag:         examjul19
tag:         examjun19
tag:         vs1
remote branch:  local/year-2018-19
remote branch:  repair/year-2018-19
user:        Uwe Brauer <oub at mat.ucm.es>
date:        Fri May 24 10:35:12 2019 +0200
summary:     Add exam control 2.

changeset:   177:24cf4af74eb7
branch:      year-2017-18
remote branch:  local/year-2017-18
remote branch:  repair/year-2017-18
user:        Uwe Brauer <oub at mat.ucm.es>
date:        Sat Sep 22 10:07:33 2018 +0200
summary:     Add actas

changeset:   154:8598c187ab27
branch:      examsep17
remote branch:  local/examsep17
remote branch:  repair/examsep17
user:        Uwe Brauer  <oub at mat.ucm.es>
date:        Tue Aug 08 07:38:08 2017 +0000
summary:     Almost finish examen

changeset:   153:71e7e0654667
branch:      year-2016-17
remote branch:  local/year-2016-17
remote branch:  repair/year-2016-17
parent:      149:00619881e076
parent:      152:9376a2cadf4a
user:        Uwe Brauer  <oub at mat.ucm.es>
date:        Sat Jul 08 12:34:45 2017 +0000
summary:     Merge examjun17 into year-2016-17

changeset:   152:9376a2cadf4a
branch:      examjun17
remote branch:  local/examjun17
remote branch:  repair/examjun17
user:        Uwe Brauer  <oub at mat.ucm.es>
date:        Wed Jun 21 18:06:02 2017 +0000
summary:     Modify Uwe add Benj excel
--------------
Just in case 

Hg heads -t

hg heads -t
beautifygraph: unsupported encoding, UTF-8 required
changeset:   350:7332d56ada58
tag:         tip
topic:       examen-mayo
user:        Uwe Brauer <oub at mat.ucm.es>
date:        Sat Jun 05 08:50:24 2021 +0200
summary:     Rename case collision file

changeset:   329:9c90c7ecd39b
branch:      english
remote branch:  repair/english
user:        Uwe Brauer <oub at mat.ucm.es>
date:        Sat May 29 11:44:46 2021 +0200
summary:     Finish Exam English


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

No.


> Can you clone from the USB-stick?

Ah this I did not try, only to pull


Thanks

-------------- 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/20210605/f34cc4a4/attachment.p7s>