Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update CoupledClutches.mos #4348

Closed
wants to merge 2 commits into from
Closed

Update CoupledClutches.mos #4348

wants to merge 2 commits into from

Conversation

DagBruck
Copy link
Contributor

Updated to Dymola command set from this millennium.

Updated to Dymola command set from this millennium.
@DagBruck DagBruck added the L: Resources Issue addresses Modelica/Resources (excl. C-Sources) label Feb 28, 2024
@DagBruck DagBruck added this to the MSL4.1.0 milestone Feb 28, 2024
dietmarw
dietmarw previously approved these changes Feb 28, 2024
Copy link
Member

@dietmarw dietmarw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@beutlich beutlich changed the base branch from maint/4.1.0 to master February 28, 2024 16:26
@beutlich beutlich dismissed dietmarw’s stale review February 28, 2024 16:26

The base branch was changed.

@beutlich beutlich changed the base branch from master to maint/4.1.0 February 28, 2024 16:26
@beutlich
Copy link
Member

beutlich commented Feb 28, 2024

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

@AHaumer AHaumer self-requested a review February 28, 2024 17:44
AHaumer
AHaumer previously approved these changes Feb 28, 2024
Copy link
Contributor

@AHaumer AHaumer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok
as @beutlich said, merge to master, then to maint/4.1.0

tobolar
tobolar previously approved these changes Feb 29, 2024
Copy link
Contributor

@tobolar tobolar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fine to me.

@DagBruck
Copy link
Contributor Author

DagBruck commented Mar 1, 2024

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
Copy link
Member

dietmarw commented Mar 1, 2024

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

@DagBruck
Copy link
Contributor Author

DagBruck commented Mar 1, 2024

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
Copy link
Member

dietmarw commented Mar 1, 2024

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

@DagBruck DagBruck changed the base branch from maint/4.1.0 to master March 1, 2024 13:02
@DagBruck DagBruck dismissed stale reviews from tobolar and AHaumer March 1, 2024 13:02

The base branch was changed.

@DagBruck DagBruck changed the base branch from master to maint/4.1.0 March 1, 2024 13:02
@DagBruck
Copy link
Contributor Author

DagBruck commented Mar 1, 2024

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

@DagBruck DagBruck closed this Mar 14, 2024
@beutlich beutlich deleted the DagBruck-patch-1 branch March 14, 2024 12:45
@beutlich beutlich modified the milestones: MSL4.1.0, never Mar 14, 2024
@beutlich beutlich removed the request for review from dietmarw March 14, 2024 12:45
@beutlich beutlich added the invalid Invalid issue label Mar 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
invalid Invalid issue L: Resources Issue addresses Modelica/Resources (excl. C-Sources)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants