Skip to content

Commit 0bd97e1

Browse files
richardlaudanielleadams
authored andcommitted
doc: update backport labels in release guide
Add `backport-open-v1.x,backported-to-v1.x` labels to `branch-diff` commands as these indicate pull requests that are being manually backported and should not be cherry-picked. PR-URL: #39544 Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Beth Griggs <bgriggs@redhat.com> Reviewed-By: Danielle Adams <adamzdanielle@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
1 parent 86d144c commit 0bd97e1

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

doc/guides/releases.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ duplicate or not.
175175
For a list of commits that could be landed in a patch release on v1.x:
176176

177177
```console
178-
$ branch-diff v1.x-staging master --exclude-label=semver-major,semver-minor,dont-land-on-v1.x,backport-requested-v1.x,backport-blocked-v1.x --filter-release --format=simple
178+
$ branch-diff v1.x-staging master --exclude-label=semver-major,semver-minor,dont-land-on-v1.x,backport-requested-v1.x,backport-blocked-v1.x,backport-open-v1.x,backported-to-v1.x --filter-release --format=simple
179179
```
180180

181181
Previously released commits and version bumps do not need to be
@@ -195,7 +195,7 @@ command. (For semver-minor releases, make sure to remove the `semver-minor` tag
195195
from `exclude-label`.)
196196

197197
```console
198-
$ branch-diff v1.x-staging master --exclude-label=semver-major,semver-minor,dont-land-on-v1.x,backport-requested-v1.x,backport-blocked-v1.x --filter-release --format=sha --reverse | xargs git cherry-pick
198+
$ branch-diff v1.x-staging master --exclude-label=semver-major,semver-minor,dont-land-on-v1.x,backport-requested-v1.x,backport-blocked-v1.x,backport-open-v1.x,backported-to-v1.x --filter-release --format=sha --reverse | xargs git cherry-pick
199199
```
200200

201201
When cherry-picking commits, if there are simple conflicts you can resolve

0 commit comments

Comments
 (0)