@@ -19,19 +19,20 @@ some explanation and are quite subjective. Good judgement is required.
19
19
1 . ** Is the fix worth a backport?**
20
20
21
21
This is really subjective. An ICE fix usually is. Moving a lint to a _ lower_
22
- group usually as well. An FP fix usually not (on its own). If a backport is
23
- done anyway, FP fixes might also be included. If the PR has a lot of changes,
24
- backports must be considered more carefully.
22
+ group (from warn- to allow-by-default) usually as well. An FP fix usually not
23
+ (on its own). If a backport is done anyway, FP fixes might also be included.
24
+ If the PR has a lot of changes, backports must be considered more carefully.
25
25
26
26
2 . ** Is the problem that was fixed by the PR already in ` beta ` ?**
27
27
28
28
It could be that the problem that was fixed by the PR hasn't made it to the
29
29
` beta ` branch of the Rust repo yet. If that's the case, and the fix is
30
- already synced to the Rust repo, the fix doesn't need to be backported. If
31
- the fix PR is not synced yet, the fix PR either needs to be "backported" to
32
- the Rust ` master ` branch or to ` beta ` in the next backport cycle.
30
+ already synced to the Rust repo, the fix doesn't need to be backported, as it
31
+ will hit stable together with the commit that introduced the problem. If the
32
+ fix PR is not synced yet, the fix PR either needs to be "backported" to the
33
+ Rust ` master ` branch or to ` beta ` in the next backport cycle.
33
34
34
- 3 . ** Is the fix already synced to ` master ` ? **
35
+ 3 . ** Make sure that the fix is on ` master ` before porting to ` beta ` **
35
36
36
37
The fix must already be synced to the Rust ` master ` branch. Otherwise, the
37
38
next ` beta ` will be missing this fix again. If it is not yet in ` master ` it
@@ -67,9 +68,9 @@ git reset --hard upstream/beta
67
68
68
69
## Backport the changes
69
70
70
- When PR is merged with the GitHub merge queue, the PR is closed with the message
71
+ When a PR is merged with the GitHub merge queue, the PR is closed with the message
71
72
72
- > <PR title > (#<PR number >)
73
+ > \ < PR title\ > (#\ < PR number\ > )
73
74
74
75
This commit needs to be backported. To do that, find the ` <sha1> ` of that commit
75
76
and run the following command in the clone of the ** Rust repository** :
@@ -95,7 +96,7 @@ Backports:
95
96
- <Link to the Clippy PR>
96
97
- ...
97
98
98
- <Short summary what is backported and why>
99
+ <Short summary of what is backported and why>
99
100
```
100
101
101
102
Mark is from the release team and they ultimately have to merge the PR before
0 commit comments