Skip to content

Commit 4c7f16d

Browse files
ofrobotsjasnell
authored andcommitted
doc: add Backport-PR-URL info in backport guide
PR-URL: #23701 Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Matheus Marchini <mat@mmarchini.me> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Refael Ackermann <refack@gmail.com> Reviewed-By: Shelley Vohr <codebytere@gmail.com> Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com> Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: George Adams <george.adams@uk.ibm.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
1 parent bb26d4f commit 4c7f16d

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

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

+8-5
Original file line numberDiff line numberDiff line change
@@ -68,17 +68,20 @@ hint: and commit the result with 'git commit'
6868
using `git add`, and then commit the changes. That can be done with
6969
`git cherry-pick --continue`.
7070
6. Leave the commit message as is. If you think it should be modified, comment
71-
in the Pull Request.
71+
in the Pull Request. The `Backport-PR-URL` metadata does need to be added to
72+
the commit, but this will be done later.
7273
7. Make sure `make -j4 test` passes.
7374
8. Push the changes to your fork
7475
9. Open a pull request:
7576
1. Be sure to target the `v8.x-staging` branch in the pull request.
76-
2. Include the backport target in the pull request title in the following
77+
1. Include the backport target in the pull request title in the following
7778
format — `[v8.x backport] <commit title>`.
7879
Example: `[v8.x backport] process: improve performance of nextTick`
79-
3. Check the checkbox labeled "Allow edits from maintainers".
80-
4. In the description add a reference to the original PR
81-
5. Run a [`node-test-pull-request`][] CI job (with `REBASE_ONTO` set to the
80+
1. Check the checkbox labeled "Allow edits from maintainers".
81+
1. In the description add a reference to the original PR.
82+
1. Amend the commit message and include a `Backport-PR-URL:` metadata and
83+
re-push the change to your fork.
84+
1. Run a [`node-test-pull-request`][] CI job (with `REBASE_ONTO` set to the
8285
default `<pr base branch>`)
8386
10. If during the review process conflicts arise, use the following to rebase:
8487
`git pull --rebase upstream v8.x-staging`

0 commit comments

Comments
 (0)