Skip to content

Commit 3ff520b

Browse files
authored
Merge pull request #32006 from MForster/m/upstreaming-policy
Update LLVM development policy
2 parents a1e281d + 66c333d commit 3ff520b

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

docs/Branches.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,15 @@ You can use any of the branch names as the argument to `--scheme`, such as `mast
6363
... 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
6464
[Apple's branching scheme](https://github.com/apple/llvm-project/blob/apple/master/apple-docs/AppleBranchingScheme.md)
6565
document to determine which `apple/stable/*` branch you should cherry-pick to.
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.
6668

6769
2) Changes that depend on Swift (this only applies to LLDB): new commits go to `swift/master-next`
6870

6971
...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.)*
7072

73+
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.
74+
7175
## Automerging
7276

7377
Some branches are *automerged* into other branches, to keep them in sync. This is just a process that runs `git merge` at a regular interval. These are run by Apple and are either on a "frequent" (sub-hourly) or nightly schedule.

0 commit comments

Comments
 (0)