Skip to content

Handle situations where the previous patch release is a direct ancestor of HEAD#14

Merged
aaruni96 merged 2 commits intomasterfrom
ak96/linear-history
May 8, 2026
Merged

Handle situations where the previous patch release is a direct ancestor of HEAD#14
aaruni96 merged 2 commits intomasterfrom
ak96/linear-history

Conversation

@aaruni96
Copy link
Copy Markdown
Member

Fixes #13

@lgoettgens
Copy link
Copy Markdown
Member

I am not sure if this is possible to do with an option. In the past, we also had periods in AA/Nemo where we used release branches.
Could you instead traverse the git tree and verify that the intermediate patch releases are ancestors of the current master?
And what about scenarios where we have a first patch release on the master branch, then do a minor bump on master but later release more patch releases on a release branch?

@aaruni96
Copy link
Copy Markdown
Member Author

aaruni96 commented May 5, 2026

Thanks for the hint @lgoettgens . Can you check that the new solution makes more sense?

@aaruni96 aaruni96 force-pushed the ak96/linear-history branch from f06ad93 to 7139b53 Compare May 5, 2026 18:10
@lgoettgens
Copy link
Copy Markdown
Member

I don't understand all the details of the script, but this seems reasonable to me. (Just the PR title needs a tweak.)

@aaruni96 aaruni96 changed the title Add LINEARHISTORY option Handle situations where the previous patch release is a direct ancestor of HEAD May 8, 2026
@aaruni96 aaruni96 merged commit c8d6019 into master May 8, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Duplicate release note entries

2 participants