Skip to content

Commit b7aa227

Browse files
committed
Update for review.
1 parent 88d955a commit b7aa227

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

src/release/backporting.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,9 @@ Only a few people are even aware of the process, but this is actually something
88
Backports of PRs to the beta branch are usually only done to fix regressions.
99
Getting a PR backported to the beta branch involves the following process:
1010

11-
1. Add the label [`beta-nominated`](https://github.com/rust-lang/rust/pulls?q=is%3Apr+label%3Abeta-nominated) to the PR to be backported.
11+
1. Add the label [`beta-nominated`](https://github.com/rust-lang/rust/pulls?q=is%3Apr+label%3Abeta-nominated+-label%3Abeta-accepted) to the PR to be backported.
1212
This marks the PR as in the state that it needs attention from the appropriate team to decide if it should be backported.
13-
It is also suggested to apply the `I-*-nominated` and the appropriate `T-` (team) label: that'll _really_ get their attention!
14-
Anybody with triage access is free to make these labels.
13+
Anybody with triage access is free to add this label.
1514

1615
2. If the team thinks it should be backported, then they should add the [`beta-accepted`](https://github.com/rust-lang/rust/pulls?q=is%3Apr+label%3Abeta-accepted) label.
1716
Otherwise they should remove the nominated label.
@@ -22,14 +21,16 @@ Getting a PR backported to the beta branch involves the following process:
2221

2322
1. Create a local branch off the `beta` branch.
2423
2. Cherry-pick all of the PRs that have both [`beta-nominated` and `beta-accepted`][nominated-plus-accepted] labels.
24+
It is usually preferred to not include PRs that have not been merged in case there are any last minute changes, or it fails when running the full CI tests.
2525
3. (Recommended) Run some tests locally.
2626
It is not uncommon that the backports may not apply cleanly, or the UI tests need to be re-blessed if there are differences in the output.
2727
4. Open a PR **against the beta branch** with a title that starts with `[beta]` (so reviewers can see its specialness).
2828
5. List all of the PRs being backported in the PR description.
2929
[Here's an example](https://github.com/rust-lang/rust/pull/64097).
3030

3131
4. A reviewer (typically from the release team) needs to verify that the backport looks correct and that it's submitted to the beta branch.
32-
They will the approve with `@bors r+`.
32+
They will then approve with `@bors r+ rollup=never` (to avoid it being rolled up on accident).
33+
If the author of the PR has r+ rights, and has not made significant changes while backporting, they can also self-approve the PR.
3334

3435
5. Go through all of the PRs being backported and:
3536

0 commit comments

Comments
 (0)