search

modelica / ModelicaStandardLibrary

Free (standard conforming) library to model mechanical (1D/3D), electrical (analog, digital, machines), magnetic, thermal, fluid, control systems and hierarchical state machines. Also numerical functions and functions for strings, files and streams are included.
https://doc.modelica.org
BSD 3-Clause "New" or "Revised" License
452 stars 165 forks source link

First figure #4288

Closed Harisankar-Allimangalath closed 5 months ago

Harisankar-Allimangalath commented 5 months ago

back port of #4094

Harisankar-Allimangalath commented 5 months ago

@henrikt-ma @maltelenz I am not authorized to merge this PR , This is how it shows for me

image

maltelenz commented 5 months ago

Same for me. I'm guessing @beutlich has more authorization, but @casella and @AHaumer (in their role as project leaders) may want to review the list of people authorized to merge to the maint branch (or decide not to, and take on the burden to press all the merge buttons themselves).

HansOlsson commented 5 months ago

@henrikt-ma @maltelenz I am not authorized to merge this PR , This is how it shows for me

But isn't one problem that this PR needs to be manually rebased first, since there are conflicts?

maltelenz commented 5 months ago

But isn't one problem that this PR needs to be manually rebased first, since there are conflicts?

It merges cleanly for me in my local client. What makes you say there are conflicts?

HansOlsson commented 5 months ago

But isn't one problem that this PR needs to be manually rebased first, since there are conflicts?

It merges cleanly for me in my local client. What makes you say there are conflicts?

The GitHub UI saying: "This branch cannot be rebased due to conflicts" and dimming "Rebase and merge" etc.

I believe the issue is that the commits contain bumping language version to 3.5 and then reverting that, which conflicts with other changes of language version.

So, it is a matter of cherry-picking the other 3 commits.

maltelenz commented 5 months ago

The GitHub UI saying: "This branch cannot be rebased due to conflicts" and dimming "Rebase and merge" etc.

Maybe I can't see that because I'm not authorized enough for the maint branch :)

I'll create a separate PR with a clean cherry-pick.

maltelenz commented 5 months ago

Replaced by #4291 . Closing.