Repository navigation
Cherry-pick every push on v5 onto v6 - #434
Merged
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Why
v6must hold every commit ofv5plus its own ones, without forwarding them by hand.What
forward-port.ymlruns on each push onv5(and by hand): it cherry-picks with-xthe commits ofv5not yet inv6ontov6, then pushesv6.(cherry picked from commit …)trailer, or same patch. The merge commits of the pull requests are not copied, their commits are.v6has its own protection rule (no pull request required, no force push, no deletion) so that the workflow can push to it;v5keeps thev*rule.docs/contributing.mdexplains it.Tests
Run against a local repository: pull request merged into v5, run again, conflict then manual resolution, patch already on v6.