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.

Sign up for GitHub

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

Jump to bottom

Add script to list commits that have yet to be picked into master #2108

Merged
merged 2 commits into from
Jun 28, 2023
Merged

Add script to list commits that have yet to be picked into master #2108

merged 2 commits into from
Jun 28, 2023

Conversation

timvisee
Copy link
Member

@timvisee timvisee commented Jun 20, 2023 •
edited
Loading

This allows us to easily detect cherry-picks we missed from dev to master on our release branch.

For example:

$ ./tools/missed_cherry_picks.sh
286ca9f5e4230bed1a1c726cbc2d93b7b8aa0f25 0.11.0 cherry picks (#1174)
93a4499859b31cea94dbad0ee4df8b7aeea407a8 Update: unmaintained crate memmap -> memmap2 (#559) (#1160)
a0b6fa81b75c1695766c056650e3e8d8b6ab97c5 Consensus q n a (#1169)
017df525289fad13e129a58137fad028cc34ded4 Use less ram for id tracker (#1176)
383100ebb6e60328f7bf1aa93b80ecd6c82d4de1 remove suggesting changes in replications on replication factor change (#1177)
# -- snip --
7916f01fa4abe5a03fe0ce011b1d788395f3bc3b Migrate from OpenSSL to Rustls (#1865)
8342288e1f2bc9b65d96d74c5946eb94a53acc6b Fix documentation links (#2000)
d67bf1ce3742e9b5d61dda2c4c3274686dfce5a7 Update memmap2 to remove Windows specific edge case (#1964)
d40ef296801ae75db0e42d1aaeb3b857423fea98 Update Cargo.toml, specify license and other things (#1943)
967d387a3761191e96d3d33f0697868882c6ec1a Web UI integration (#2009)
114a8dcc8730e7dee4dcbe9438dbc80072233f7d Bump memmap2 from 0.6.2 to 0.7.0 (#2049)
1d035501a4de27065e6fefe7bcff7cfa4d754713 Bump constant_time_eq from 0.2.6 to 0.3.0 (#2106)

On the current branches we are not missing anything, so that is fantastic:

$ ./tools/missed_cherry_picks.sh

We can update the IGNORE_UPTO constant to a new value to ignore all commits before it. That way we remove noise of commits that were merged (but changed). I've manually checked all commits that were listed before and have updated this hash accordingly.

All Submissions:

  • Contributions should target the dev branch. Did you create your branch from dev?
  • Have you followed the guidelines in our Contributing document?
  • Have you checked to ensure there aren't other open Pull Requests for the same update/change?

timvisee added 2 commits June 20, 2023 10:31
@timvisee
Add script to list commits that have yet to be picked into master
148321a 
This allows us to easily detect cherry-picks we missed from dev to
master on our release branch.
@timvisee
Update missed cherry picks ignore hash
c222e82
@timvisee timvisee marked this pull request as ready for review June 20, 2023 08:48
@timvisee timvisee requested review from generall and ffuugoo June 20, 2023 08:48
@agourlay
Copy link
Member

Thank you very much for the initiative 👍

@timvisee timvisee requested a review from agourlay June 20, 2023 10:21
agourlay
agourlay approved these changes Jun 20, 2023
View reviewed changes
Copy link
Member

@agourlay agourlay left a comment

Choose a reason for hiding this comment

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

Gave it a try, seems to work nicely 👍

ffuugoo
ffuugoo approved these changes Jun 21, 2023
View reviewed changes
Copy link
Contributor

@ffuugoo ffuugoo left a comment

Choose a reason for hiding this comment

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

Works on my machine as well. LGTM.

@timvisee timvisee merged commit e1a6909 into dev Jun 28, 2023
@ffuugoo ffuugoo deleted the script-list-missed-cherry-picks branch June 28, 2023 14:49
timvisee added a commit that referenced this pull request Jul 3, 2023
@timvisee
Add script to list commits that have yet to be picked into master (#2108
238b443 
)

* Add script to list commits that have yet to be picked into master

This allows us to easily detect cherry-picks we missed from dev to
master on our release branch.

* Update missed cherry picks ignore hash
timvisee added a commit to Jesse-Bakker/qdrant that referenced this pull request Jul 13, 2023
@timvisee
Add script to list commits that have yet to be picked into master (qd…
7c61a5d 
…rant#2108)

* Add script to list commits that have yet to be picked into master

This allows us to easily detect cherry-picks we missed from dev to
master on our release branch.

* Update missed cherry picks ignore hash
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ffuugoo ffuugoo ffuugoo approved these changes

@generall generall generall approved these changes

@agourlay agourlay agourlay approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@timvisee @agourlay @generall @ffuugoo