Stream: Coq Platform devs & users

Topic: Branch status


view this post on Zulip Michael Soegtrop (Dec 14 2020 at 19:26):

@Théo Zimmermann @Enrico Tassi : FYI: the master branch is now identical to the 8.12 branch - I decided to take that as master and then change it such that it contains master packages of all plugins, so that the additional changes in the 8.13 branch - that is the picking for 8.13 - would anyway be undone. The master branch is more squashed thatn 8.12, so the log is not the same, but the content is.

view this post on Zulip Michael Soegtrop (Dec 14 2020 at 19:29):

P.S.: the 8.13 branch is also mostly identical to 8.12. The differences are:

view this post on Zulip Théo Zimmermann (Dec 14 2020 at 20:14):

I thought about this branching question today! I am worried that maintaining several almost identical branches is going to be a burden. What about putting everything (the version for 8.12 and 8.13 and the dev version when it is added) in the same branch (master). Most of the infrastructure is the same anyway, same for the documentation. Only the opam patch repo would be duplicated (one patch repo for each version).

view this post on Zulip Michael Soegtrop (Dec 14 2020 at 20:39):

@Théo Zimmermann : actually the lagest part of the platform is the opam patch repo. I expect that the rest doesn't change that much. It is a somewhat exceptional situation that there are so many changes in the common infrastructure. I expect that in the future mostly the opam patch repos change, and I think this is easier to manage if they are in separate branches.

view this post on Zulip Théo Zimmermann (Dec 14 2020 at 20:40):

Yes, I understand.

view this post on Zulip Enrico Tassi (Dec 14 2020 at 20:55):

I've just pushed the last fix for the windows installer on 32 bits (a few hardcoded "64" were there).

view this post on Zulip Michael Soegtrop (Dec 15 2020 at 09:10):

@Enrico: thanks - I will do a test build locally to confirm that it works.


Last updated: Jan 30 2023 at 12:03 UTC