From 1d63482fbbaa90ef8a8ae6ba396b20ea748c397a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Le=C3=B3n=20Orell=20Valerian=20Liehr?= Date: Sun, 14 Jan 2024 10:32:35 +0100 Subject: [PATCH 1/2] Mention label has-merge-commits --- src/contributing.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/contributing.md b/src/contributing.md index d6b9fc84d..925b4d3db 100644 --- a/src/contributing.md +++ b/src/contributing.md @@ -243,7 +243,13 @@ The CI will also run tidy and will fail if tidy fails. Rust follows a _no merge-commit policy_, meaning, when you encounter merge conflicts you are expected to always rebase instead of merging. E.g. always use rebase when bringing the latest changes from the master branch to your feature -branch. +branch. If your PR contains merge commits, it will get marked as `has-merge-commits`. +Once you have removed the merge commits, e.g., through an interactive rebase, you +should remove the label again: + + @rustbot label -has-merge-commits + +See [this chapter][labeling] for more details. If you encounter merge conflicts or when a reviewer asks you to perform some changes, your PR will get marked as `S-waiting-on-author`. When you resolve @@ -251,8 +257,6 @@ them, you should use `@rustbot` to mark it as `S-waiting-on-review`: @rustbot label -S-waiting-on-author +S-waiting-on-review -See [this chapter][labeling] for more details. - GitHub allows [closing issues using keywords][closing-keywords]. This feature should be used to keep the issue tracker tidy. However, it is generally preferred to put the "closes #123" text in the PR description rather than the issue commit; From 8579992357581f4f52977e49eaa02fdeb83df8dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Le=C3=B3n=20Orell=20Valerian=20Liehr?= Date: Sun, 14 Jan 2024 11:04:08 +0100 Subject: [PATCH 2/2] Add guidelines for backport-accepted PRs --- src/contributing.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/contributing.md b/src/contributing.md index 925b4d3db..1b230c74a 100644 --- a/src/contributing.md +++ b/src/contributing.md @@ -263,6 +263,19 @@ to put the "closes #123" text in the PR description rather than the issue commit particularly during rebasing, citing the issue number in the commit can "spam" the issue in question. +However, if your PR fixes a stable-to-beta or stable-to-stable regression and has +been accepted for a beta and/or stable backport (i.e., it is marked `beta-accepted` +and/or `stable-accepted`), please do *not* use any such keywords since we don't +want the corresponding issue to get auto-closed once the fix lands on master. +Please update the PR description while still mentioning the issue somewhere. +For example, you could write `Fixes (after beta backport) #NNN.`. + +As for further actions, please keep a sharp look-out for a PR whose title begins with +`[beta]` or `[stable]` and which backports the PR in question. When that one gets +merged, the relevant issue can be closed. The closing comment should mention all +PRs that were involved. If you don't have the permissions to close the issue, please +leave a comment on the original PR asking the reviewer to close it for you. + [labeling]: ./rustbot.md#issue-relabeling [closing-keywords]: https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue