Skip to content

Commit c722421

Browse files
GaryGSCtargos
authored andcommitted
doc: update 8.x to 10.x in backporting guide
PR-URL: #30481 Refs: #22879 Reviewed-By: Trivikram Kamat <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: Myles Borins <[email protected]>
1 parent 1413377 commit c722421

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

doc/guides/backporting-to-release-lines.md

+11-11
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ commits be cherry-picked or backported.
2626

2727
## How to submit a backport pull request
2828

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

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

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

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

0 commit comments

Comments
 (0)