1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

doc: add Backport-PR-URL info in backport guide

Browse Source 
PR-URL: https://github.com/nodejs/node/pull/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>
This commit is contained in:
Ali Ijaz Sheikh 2018-10-16 13:03:34 -07:00
parent f14274714d
commit 72cf81f514
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
doc/guides/backporting-to-release-lines.md
View File

@ -68,17 +68,20 @@ hint: and commit the result with 'git commit'
using `git add`, and then commit the changes. That can be done with using `git add`, and then commit the changes. That can be done with
`git cherry-pick --continue`. `git cherry-pick --continue`.
6. Leave the commit message as is. If you think it should be modified, comment 6. Leave the commit message as is. If you think it should be modified, comment
in the Pull Request. in the Pull Request. The `Backport-PR-URL` metadata does need to be added to
the commit, but this will be done later.
7. Make sure `make -j4 test` passes. 7. Make sure `make -j4 test` passes.
8. Push the changes to your fork 8. Push the changes to your fork
9. Open a pull request: 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 `v8.x-staging` branch in the pull request.
2. Include the backport target in the pull request title in the following 1. Include the backport target in the pull request title in the following
format — `[v8.x backport] <commit title>`. format — `[v8.x backport] <commit title>`.
Example: `[v8.x backport] process: improve performance of nextTick` Example: `[v8.x backport] process: improve performance of nextTick`
3. Check the checkbox labeled "Allow edits from maintainers". 1. Check the checkbox labeled "Allow edits from maintainers".
4. In the description add a reference to the original PR 1. 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 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>`) default `<pr base branch>`)
10. If during the review process conflicts arise, use the following to rebase: 10. If during the review process conflicts arise, use the following to rebase:
`git pull --rebase upstream v8.x-staging` `git pull --rebase upstream v8.x-staging`