Skip to content

Commit 4e0fad8

Browse files
authored
Add note that LLDB changes should be cherry-picked to swift/master (#32133)
* Add note that LLDB changes should be cherry-picked to `swift/master` * New Swift-dependent commits should go to `swift/master`, not `swift/master-next`. * Update naming scheme for release branches * Fix indentation
1 parent 9a61985 commit 4e0fad8

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

docs/Branches.md

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -58,17 +58,20 @@ You can use any of the branch names as the argument to `--scheme`, such as `mast
5858

5959
- LLVM Project: the destination branch depends on the kind of change that must be made:
6060

61-
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).
61+
1) LLVM Project changes that don't depend on Swift
62+
63+
- New commits go to `master` in the upstream [llvm-project](https://github.com/llvm/llvm-project).
6264

63-
... 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
64-
[Apple's branching scheme](https://github.com/apple/llvm-project/blob/apple/master/apple-docs/AppleBranchingScheme.md)
65-
document to determine which `apple/stable/*` branch you should cherry-pick to.
65+
- 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.
6666

67-
Note that **no new changes should be submitted directly to `apple/master`**. We are actively working on eliminating the differences from upstream LLVM.
67+
Note that **no new changes should be submitted directly to `apple/master`**. We are actively working on eliminating the differences from upstream LLVM.
68+
69+
2) Changes that depend on Swift (this only applies to LLDB)
70+
- New commits go to `swift/master` (_not_ an `apple/stable/*` branch, as these shouldn't contain changes that depend on Swift).
6871

69-
2) Changes that depend on Swift (this only applies to LLDB): new commits go to `swift/master-next`
72+
- Then cherry-pick these commits to `swift/master-next`.
7073

71-
...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.)*
74+
- 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.)*
7275

7376
In the long term we want to eliminate the differences from upstream LLVM for these changes as well, but for now there is no concrete plan. So, submitting to `swift/master-next` continues to be allowed.
7477

0 commit comments

Comments
 (0)