You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
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
Copy file name to clipboardExpand all lines: docs/Branches.md
+10-7Lines changed: 10 additions & 7 deletions
Original file line number
Diff line number
Diff line change
@@ -58,17 +58,20 @@ You can use any of the branch names as the argument to `--scheme`, such as `mast
58
58
59
59
- LLVM Project: the destination branch depends on the kind of change that must be made:
60
60
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).
62
64
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
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.
66
66
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).
68
71
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`.
70
73
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.)*
72
75
73
76
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.
0 commit comments