From d2477d9440db9c3bdaa9dfe73ef2c55243b5849e Mon Sep 17 00:00:00 2001 From: martinboehme Date: Tue, 2 Jun 2020 10:06:41 +0200 Subject: [PATCH 1/4] Add note that LLDB changes should be cherry-picked to `swift/master` --- docs/Branches.md | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/docs/Branches.md b/docs/Branches.md index e533c3af5e351..d4e4e43eb80c7 100644 --- a/docs/Branches.md +++ b/docs/Branches.md @@ -58,15 +58,18 @@ You can use any of the branch names as the argument to `--scheme`, such as `mast - LLVM Project: the destination branch depends on the kind of change that must be made: - 1) LLVM Project changes that don't depend on Swift: New commits go to `master` in the upstream [llvm-project](https://github.com/llvm/llvm-project). + 1) LLVM Project changes that don't depend on Swift + + - New commits go to `master` in the upstream [llvm-project](https://github.com/llvm/llvm-project). - ... then these commits can be cherry-picked to an appropriate, `swift/master` aligned `apple/stable/*` branch in Apple's fork of [llvm-project](https://github.com/apple/llvm-project). Please see - [Apple's branching scheme](https://github.com/apple/llvm-project/blob/apple/master/apple-docs/AppleBranchingScheme.md) - document to determine which `apple/stable/*` branch you should cherry-pick to. + - Then cherry-pick these commits to an appropriate, `swift/master` aligned `apple/stable/*` branch in Apple's fork of [llvm-project](https://github.com/apple/llvm-project). Please see [Apple's branching scheme](https://github.com/apple/llvm-project/blob/apple/master/apple-docs/AppleBranchingScheme.md) document to determine which `apple/stable/*` branch you should cherry-pick to. - 2) Changes that depend on Swift (this only applies to LLDB): new commits go to `swift/master-next` + 2) Changes that depend on Swift (this only applies to LLDB) + - New commits go to `swift/master-next`. - ...then cherry-pick to the release branch (`swift/swift-x.y-branch`) if necessary, following the appropriate release process. (Usually this means filling out a standard template, finding someone to review your code if that hasn't already happened, and getting approval from that repo's *release manager.)* + - Then cherry-pick these commits to `swift/master` (_not_ an `apple/stable/*` branch, as these shouldn't contain changes that depend on Swift). + + - If necessary, cherry-pick to the release branch (`swift/swift-x.y-branch`), following the appropriate release process. (Usually this means filling out a standard template, finding someone to review your code if that hasn't already happened, and getting approval from that repo's *release manager.)* ## Automerging From 0e9aa2484f258f7b4d9ca5ba910b7214d2513005 Mon Sep 17 00:00:00 2001 From: martinboehme Date: Wed, 3 Jun 2020 08:06:48 +0200 Subject: [PATCH 2/4] New Swift-dependent commits should go to `swift/master`, not `swift/master-next`. --- docs/Branches.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/Branches.md b/docs/Branches.md index d4e4e43eb80c7..f58061b5fa066 100644 --- a/docs/Branches.md +++ b/docs/Branches.md @@ -65,9 +65,9 @@ You can use any of the branch names as the argument to `--scheme`, such as `mast - Then cherry-pick these commits to an appropriate, `swift/master` aligned `apple/stable/*` branch in Apple's fork of [llvm-project](https://github.com/apple/llvm-project). Please see [Apple's branching scheme](https://github.com/apple/llvm-project/blob/apple/master/apple-docs/AppleBranchingScheme.md) document to determine which `apple/stable/*` branch you should cherry-pick to. 2) Changes that depend on Swift (this only applies to LLDB) - - New commits go to `swift/master-next`. + - New commits go to `swift/master` (_not_ an `apple/stable/*` branch, as these shouldn't contain changes that depend on Swift). - - Then cherry-pick these commits to `swift/master` (_not_ an `apple/stable/*` branch, as these shouldn't contain changes that depend on Swift). + - Then cherry-pick these commits to `swift/master-next`. - If necessary, cherry-pick to the release branch (`swift/swift-x.y-branch`), following the appropriate release process. (Usually this means filling out a standard template, finding someone to review your code if that hasn't already happened, and getting approval from that repo's *release manager.)* From a7ce978d74142193298c491bcbb8bbd34342d77f Mon Sep 17 00:00:00 2001 From: martinboehme Date: Wed, 3 Jun 2020 18:41:58 +0200 Subject: [PATCH 3/4] Update naming scheme for release branches --- docs/Branches.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Branches.md b/docs/Branches.md index f58061b5fa066..599893fe62e4b 100644 --- a/docs/Branches.md +++ b/docs/Branches.md @@ -69,7 +69,7 @@ You can use any of the branch names as the argument to `--scheme`, such as `mast - Then cherry-pick these commits to `swift/master-next`. - - If necessary, cherry-pick to the release branch (`swift/swift-x.y-branch`), following the appropriate release process. (Usually this means filling out a standard template, finding someone to review your code if that hasn't already happened, and getting approval from that repo's *release manager.)* + - If necessary, cherry-pick to the release branch (`swift/release/x.y`), following the appropriate release process. (Usually this means filling out a standard template, finding someone to review your code if that hasn't already happened, and getting approval from that repo's *release manager.)* ## Automerging From 99ae47662f5be0c58e53ebf24f307131664e8743 Mon Sep 17 00:00:00 2001 From: martinboehme Date: Wed, 3 Jun 2020 18:44:54 +0200 Subject: [PATCH 4/4] Fix indentation --- docs/Branches.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Branches.md b/docs/Branches.md index cd33798989b70..083f89610419d 100644 --- a/docs/Branches.md +++ b/docs/Branches.md @@ -64,7 +64,7 @@ You can use any of the branch names as the argument to `--scheme`, such as `mast - Then cherry-pick these commits to an appropriate, `swift/master` aligned `apple/stable/*` branch in Apple's fork of [llvm-project](https://github.com/apple/llvm-project). Please see [Apple's branching scheme](https://github.com/apple/llvm-project/blob/apple/master/apple-docs/AppleBranchingScheme.md) document to determine which `apple/stable/*` branch you should cherry-pick to. - Note that **no new changes should be submitted directly to `apple/master`**. We are actively working on eliminating the differences from upstream LLVM. + Note that **no new changes should be submitted directly to `apple/master`**. We are actively working on eliminating the differences from upstream LLVM. 2) Changes that depend on Swift (this only applies to LLDB) - New commits go to `swift/master` (_not_ an `apple/stable/*` branch, as these shouldn't contain changes that depend on Swift).