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
472 stars 168 forks source link

Update CoupledClutches.mos #4348

Closed DagBruck closed 6 months ago

DagBruck commented 7 months ago

Updated to Dymola command set from this millennium.

beutlich commented 7 months ago

Would be better to merge first to master and cherry-pick to maint branch after merge.

DagBruck commented 7 months ago

It would help to have some document that describes "best practices". Git permits many different ways to use the system, branching, etc. I'm happy to march along, if somebody just points in the right direction.

dietmarw commented 7 months ago

@DagBruck Check out Modelica.UsersGuide.ReleaseNotes.VersionManagement, it's been there for years ;-)

DagBruck commented 7 months ago

Thats for the pointer @dietmarw but I must admit I was confused by what it says:

Maintenance branch

Name: "maint/4.0.x"

This branch contains the released Modelica Standard Library version (e.g., v4.0.0) where all bug-fixes since this release date are included (also consecutive BUGFIX versions 4.0.1, 4.0.2, etc., up to when a new MINOR or MAJOR release becomes available; i.e., there will not be any further BUGFIX versions (i.e., 4.0.x) of a previous release).

The way I read it, the maintenance branch is created after the new release has been created, and then you can apply bug fixes to 4.0.x versions. Is that correct?

What makes me confused is that we have maint/4.1.0 define now, but 4.1 has not been released.

dietmarw commented 7 months ago

Well naming the branch 4.1.0 is simply wrong. It should be 4.1.x

DagBruck commented 7 months ago

@HansOlsson suggested I create a new pull request for the master branch: #4350.