From cdc353d8c2ecec35eeb22f9b8863c3aa3c4afb10 Mon Sep 17 00:00:00 2001
From: Ali Ijaz Sheikh <ofrobots@google.com>
Date: Tue, 16 Oct 2018 13:03:34 -0700
Subject: [PATCH] doc: add Backport-PR-URL info in backport guide
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 doc/guides/backporting-to-release-lines.md | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/doc/guides/backporting-to-release-lines.md b/doc/guides/backporting-to-release-lines.md
index 7dee8b0e640eed..150a1248b146b9 100644
--- a/doc/guides/backporting-to-release-lines.md
+++ b/doc/guides/backporting-to-release-lines.md
@@ -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
       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".
+   1. In the description add a reference to the original PR.
+   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>`)
 10. If during the review process conflicts arise, use the following to rebase:
     `git pull --rebase upstream v8.x-staging`