Repository navigation
New tool: git node bp for backporting a PR #194
Description
Rough idea:
ncu-config set remote upstream
ncu-config set branch v8.x-staging
git node bp --to v8.x-staging <prid1> <prid2>
# Fetch upstream/master
# Bring local v8.x-staging up-to-date with upstream/v8.x-staging
# git checkout -b backport-<prid1>-<prid2>-to-v8.x-staging v8.x-staging
# Look for commits on upstream/master with PR-URL ending with the provided PR IDs
# Run git cherry-pick <sha> on each of these commit
# Resolve conflict for commit1 from prid1
git node bp --continue
# Runs git cherry-pick --continue and git cherry-pick commit2
git node bp --skip
# Runs git cherry-pick --abort and git cherry-pick commit3
# Resolve conflict for commit3 from prid2
git node bp --continue
# Picked all commits that need to be backported now
Activity
gibfahn commentedon Feb 28, 2018
cc/ @nodejs/lts @nodejs/release
jasnell commentedon Feb 28, 2018
Nice
gibfahn commentedon Feb 28, 2018
This is a great idea.
It would be nice if the backport
--tofield could be worked out from thebackport-requested-to-v*.xlabels on the PR.BridgeAR commentedon Apr 9, 2018
I suggest to accept both input types:
Especially the second version would allow for mass backporting in a easy fashion.
github-actions commentedon Aug 17, 2020
This issue is stale because it has been open many days with no activity. It will be closed soon unless the stale label is removed or a comment is made.
codebytere commentedon Aug 17, 2020
This has been implemented.