Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Closed
wants to merge 1 commit into from
Closed

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions doc/guides/backporting-to-release-lines.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
`git cherry-pick --continue`.
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.
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.
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
ofrobots marked this conversation as resolved.
Show resolved Hide resolved
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
1. Check the checkbox labeled "Allow edits from maintainers".
ofrobots marked this conversation as resolved.
Show resolved Hide resolved
1. In the description add a reference to the original PR.
ofrobots marked this conversation as resolved.
Show resolved Hide resolved
1. Amend the commit message and include a `Backport-PR-URL:` metadata and
ofrobots marked this conversation as resolved.
Show resolved Hide resolved
re-push the change to your fork.
1. Run a [`node-test-pull-request`][] CI job (with `REBASE_ONTO` set to the
ofrobots marked this conversation as resolved.
Show resolved Hide resolved
default `<pr base branch>`)
10. If during the review process conflicts arise, use the following to rebase:
`git pull --rebase upstream v8.x-staging`
Expand Down