Skip to content

Commit

Permalink
doc: update 6.x to 8.x in backporting wiki
Browse files Browse the repository at this point in the history
PR-URL: #22879
Reviewed-By: Vse Mozhet Byt <vsemozhetbyt@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
  • Loading branch information
trivikr authored and targos committed Sep 18, 2018
1 parent ac34f11 commit 20305e3
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions doc/guides/backporting-to-release-lines.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 v6.x
release line. All commands will use the `v6.x-staging` branch as the target
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
branch. In order to submit a backport pull request to another branch, simply
replace that with the staging branch for the targeted release line.

Expand All @@ -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 v6.x-staging is checked out `pull` should be used instead of `fetch`
git fetch upstream v6.x-staging:v6.x-staging -f
# If v8.x-staging is checked out `pull` should be used instead of `fetch`
git fetch upstream v8.x-staging:v8.x-staging -f
# Assume we want to backport PR #10157
git checkout -b backport-10157-to-v6.x v6.x-staging
git checkout -b backport-10157-to-v8.x v8.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.
Expand Down Expand Up @@ -72,19 +72,19 @@ hint: and commit the result with 'git commit'
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 `v6.x-staging` branch in the pull request.
1. Be sure to target the `v8.x-staging` branch in the pull request.
2. Include the backport target in the pull request title in the following
format — `[v6.x backport] <commit title>`.
Example: `[v6.x backport] process: improve performance of nextTick`
format — `[v8.x backport] <commit title>`.
Example: `[v8.x backport] process: improve performance of nextTick`
3. Check the checkbox labeled "Allow edits from maintainers".
4. In the description add a reference to the original PR
5. 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 v6.x-staging`
`git pull --rebase upstream v8.x-staging`

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

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

0 comments on commit 20305e3

Please sign in to comment.