Skip to content

Commit 6126fdb

Browse files
authored
Merge pull request swiftlang#29125 from apple/hyp-patch-1
Mention where LLVM commits should go to in the branches document
2 parents b633ef2 + 9c9528a commit 6126fdb

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

docs/Branches.md

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

5757
- Swift: new commits go to `master`
5858

59-
- LLVM Project: new commits go to `swift/master-next`
59+
- LLVM Project: the destination branch depends on the kind of change that must be made:
6060

61-
...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.)*
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).
62+
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.
66+
67+
2) Changes that depend on Swift (this only applies to LLDB): new commits go to `swift/master-next`
68+
69+
...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.)*
6270

6371
## Automerging
6472

0 commit comments

Comments
 (0)