From 42669bb0498b86f522dac4b5278c058226784585 Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Tue, 27 Jul 2021 12:52:36 +0100 Subject: [PATCH] doc: update backport labels in release guide MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: https://github.com/nodejs/node/pull/39544 Reviewed-By: Michaël Zasso Reviewed-By: Beth Griggs Reviewed-By: Danielle Adams Reviewed-By: James M Snell --- doc/guides/releases.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/guides/releases.md b/doc/guides/releases.md index 8a357b595a8c89..79ca84674209c5 100644 --- a/doc/guides/releases.md +++ b/doc/guides/releases.md @@ -175,7 +175,7 @@ duplicate or not. For a list of commits that could be landed in a patch release on v1.x: ```console -$ 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 +$ 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 ``` 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 from `exclude-label`.) ```console -$ 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 +$ 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 ``` When cherry-picking commits, if there are simple conflicts you can resolve