The changesets a06b204527e6, 0f4d4a13dc16, and a8faf6f15da7 seem to be
the result of some mercurial/merge accident.
They break HOL-Analysis, and it is not really clear from the history why
and how to repair it.
The last working version is 56acd449da41.
Any opinions on what would be the best
> Strip the accidental changes from the repository?
Never strip public changesets.
> Back out the changes?
You can't really back out merges, as far as I know.
> Or do a no-op merge from a successor of the last working version?
This is also not possible, I think.
Do this instead:
$ hg revert
On 17/01/2019 21:42, Lars Hupel wrote:
>> Strip the accidental changes from the repository?
>
> Never strip public changesets.
Indeed. "Fixing" a desaster by non-monotonic operations is a desaster
squared.
>
>> Back out the changes?
>
> You can't really back out merges, as far as I know.
>
>
On 17/01/2019 21:54, Makarius wrote:
>
> The problem behind this: Angeliki got administrative push-access to the
> Isabelle repository, without anybody at Cambridge showing her how to use it.
>
> There is of course README_REPOSITORY, but the text is long. Here is the
> ultra-short version:
>
>
Thanks for your feedback!
I did what Lars suggested (96a43caa).
Luckily, a diff with a8faf6f15 revealed quite obviously what went wrong
during the merges, so I could easily redo Angeliki's tagging (689997a8).
We should be back to normal (regarding isabelle build -a).
Fabian
On 1/17/2019 3:54
