From 8f4ca4d0acb0aa2dae4a11481e3d0bb1d26304f6 Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Thu, 9 Jul 2026 12:21:09 +0300 Subject: [PATCH 1/3] Reinstate #backport-pr-title anchor --- core-team/committing.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core-team/committing.rst b/core-team/committing.rst index 0a5380e0fa..d782e7f25e 100644 --- a/core-team/committing.rst +++ b/core-team/committing.rst @@ -149,6 +149,8 @@ bug fixes or security fixes. In almost all cases the fixes should first originate on ``main`` and then be ported back to older branches. +.. _backport-pr-title: + Backporting changes to an older version ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ From dc6e0a4e3281403b096e66fac5f0e270e5f7cb0d Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Thu, 9 Jul 2026 12:49:08 +0300 Subject: [PATCH 2/3] Add explicit guidance for backport PR title --- getting-started/git-boot-camp.rst | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/getting-started/git-boot-camp.rst b/getting-started/git-boot-camp.rst index 95f6a94cab..900740f717 100644 --- a/getting-started/git-boot-camp.rst +++ b/getting-started/git-boot-camp.rst @@ -622,6 +622,9 @@ The format of a correct backport commit message is: (cherry picked from commit ) +Here ``gh-XXXXX`` is the GitHub *issue* number, and ``(GH-XXXXX)`` is the +original *pull request* number. + An example of a bad backport commit message: .. code-block:: text @@ -631,6 +634,17 @@ An example of a bad backport commit message: * Custom message +.. _backport-pr: + +The title of the backport PR must follow the same format as the commit title, +beginning with the ``[]`` prefix, and referencing the original PR with +a ``(GH-XXXXX)`` suffix. For example: + +.. code-block:: text + :class: good + + [3.15] gh-12345: Fix the spam module (GH-24680) + After the backport PR is opened, ``miss-islington`` will link it to the original PR and remove the corresponding backport label. From f57137323ddcbccc5303a9a7a537d725e6a2090e Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> Date: Thu, 9 Jul 2026 13:10:53 +0300 Subject: [PATCH 3/3] When opening..." Co-authored-by: Stan Ulbrych --- getting-started/git-boot-camp.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/getting-started/git-boot-camp.rst b/getting-started/git-boot-camp.rst index 900740f717..4d01a851e8 100644 --- a/getting-started/git-boot-camp.rst +++ b/getting-started/git-boot-camp.rst @@ -636,9 +636,9 @@ An example of a bad backport commit message: .. _backport-pr: -The title of the backport PR must follow the same format as the commit title, -beginning with the ``[]`` prefix, and referencing the original PR with -a ``(GH-XXXXX)`` suffix. For example: +When opening the backport PR, its title PR must follow the same format as the +commit title, beginning with the ``[]`` prefix and referencing the +original PR with a ``(GH-XXXXX)`` suffix. For example: .. code-block:: text :class: good