Skip to content
Permalink
Browse files

doc: update 8.x to 10.x in backporting guide

PR-URL: #30481
Refs: #22879
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Myles Borins <myles.borins@gmail.com>
  • Loading branch information
GaryGSC authored and trivikr committed Nov 14, 2019
1 parent 87cef76 commit f4061e2253db43c52fadcc81dd07787fe3ae76b6
Showing with 11 additions and 11 deletions.
  1. +11 −11 doc/guides/backporting-to-release-lines.md
@@ -26,8 +26,8 @@ commits be cherry-picked or backported.

## How to submit a backport pull request

For the following steps, let's assume that a backport is needed for the v8.x
release line. All commands will use the `v8.x-staging` branch as the target
For the following steps, let's assume that a backport is needed for the v10.x
release line. All commands will use the `v10.x-staging` branch as the target
branch. In order to submit a backport pull request to another branch, simply
replace that with the staging branch for the targeted release line.

@@ -40,10 +40,10 @@ replace that with the staging branch for the targeted release line.
# the origin remote points to your fork, and the upstream remote points
# to git://github.com/nodejs/node
cd $NODE_DIR
# If v8.x-staging is checked out `pull` should be used instead of `fetch`
git fetch upstream v8.x-staging:v8.x-staging -f
# If v10.x-staging is checked out `pull` should be used instead of `fetch`
git fetch upstream v10.x-staging:v10.x-staging -f
# Assume we want to backport PR #10157
git checkout -b backport-10157-to-v8.x v8.x-staging
git checkout -b backport-10157-to-v10.x v10.x-staging
# Ensure there are no test artifacts from previous builds
# Note that this command deletes all files and directories
# not under revision control below the ./test directory.
@@ -73,21 +73,21 @@ replace that with the staging branch for the targeted release line.
7. Make sure `make -j4 test` passes.
8. Push the changes to your fork
9. Open a pull request:
1. Be sure to target the `v8.x-staging` branch in the pull request.
1. Be sure to target the `v10.x-staging` branch in the pull request.
1. Include the backport target in the pull request title in the following
format — `[v8.x backport] <commit title>`.
Example: `[v8.x backport] process: improve performance of nextTick`
format — `[v10.x backport] <commit title>`.
Example: `[v10.x backport] process: improve performance of nextTick`
1. Check the checkbox labeled "Allow edits from maintainers".
1. In the description add a reference to the original PR.
1. Amend the commit message and include a `Backport-PR-URL:` metadata and
re-push the change to your fork.
1. Run a [`node-test-pull-request`][] CI job (with `REBASE_ONTO` set to the
default `<pr base branch>`)
10. If during the review process conflicts arise, use the following to rebase:
`git pull --rebase upstream v8.x-staging`
`git pull --rebase upstream v10.x-staging`

After the PR lands replace the `backport-requested-v8.x` label on the original
PR with `backported-to-v8.x`.
After the PR lands replace the `backport-requested-v10.x` label on the original
PR with `backported-to-v10.x`.

[Release Schedule]: https://github.com/nodejs/Release#release-schedule1
[Release Plan]: https://github.com/nodejs/Release#release-plan

0 comments on commit f4061e2

Please sign in to comment.
You can’t perform that action at this time.