New dev-tools/scripts/cherrypick.sh#514
Merged
janhoy merged 10 commits intoapache:mainfrom Jan 13, 2022
Merged
Conversation
… to release branches
…AND configurable for dry-runs with 'echo'
uschindler
reviewed
Jan 11, 2022
Contributor
uschindler
left a comment
uschindler
left a comment
There was a problem hiding this comment.
I am not so good in verifying this, because I find she'll scripts are a pain.
I am fine with a script like this, can't verify it completely. 🤔 At least I found no filename-with-spaces issue. 🤓
madrob
reviewed
Jan 11, 2022
| # See the License for the specific language governing permissions and | ||
| # limitations under the License. | ||
|
|
||
| # Forked and adapted from https://github.com/factorial-io/cherrypicker - MIT license |
Contributor
There was a problem hiding this comment.
I don't know the legal implications of this... I think it's fine but will try to find precedent from legal.
Contributor
Author
There was a problem hiding this comment.
MIT license is more liberal than ours. We might want to add the (c) notice to our main LICENSE.txt perhaps.
janhoy
added a commit
that referenced
this pull request
Jan 13, 2022
(cherry picked from commit ed74ee5)
janhoy
added a commit
that referenced
this pull request
Jan 13, 2022
(cherry picked from commit ed74ee5)
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
3 participants
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.
Script that may assist in boring backporting trivial features - especially where you don't expect any merge conflicts. See usage in script.
Tested just a few times, but I hope it will be useful when having to backport many small fixes twice between branches that are almost identical. Take it for a spin..