[Doc] Update the Branches doc with LLVM Project info #27859
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jrose-apple
reviewed
Oct 24, 2019
docs/Branches.md
Outdated
| | ------ | ------ | ------ | ||
| | master | stable | stable | ||
| | Swift | LLVM Project | | ||
| | ------ | ------ | |
There was a problem hiding this comment.
Nitpick: the dashes should extend under the whole title.
docs/Branches.md
Outdated
| - LLVM/Clang/compiler-rt: new commits go to `upstream-with-swift` | ||
|
|
||
| - LLDB: new commits go to `stable` | ||
| - LLVM Project: new commits go to `swift/master-next` | ||
|
|
||
| ...then cherry-pick to the release branch (`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.)* |
There was a problem hiding this comment.
This should probably say "swift-x.y-branch or swift/swift-x.y-branch".
docs/Branches.md
Outdated
| - `stable` is automerged into `upstream-with-swift` | ||
| - llvm.org's `master` is *also* automerged into `upstream-with-swift` | ||
| ### LLVM Project | ||
| - `swift-x.y-branch` (the *latest* release branch) is automerged into `swift/master` |
There was a problem hiding this comment.
This should say swift/swift-x.y.branch (here and below).
|
@swift-ci smoke test |
jrose-apple
reviewed
Oct 25, 2019
docs/Branches.md
Outdated
| @@ -68,6 +68,6 @@ Some branches are *automerged* into other branches, to keep them in sync. This i | |||
| - `master` is automerged into `master-next` | |||
|
|
|||
| ### LLVM Project | |||
| - `swift-x.y-branch` (the *latest* release branch) is automerged into `swift/master` | |||
| - `swift/swift-x.y-branch` (the *latest* release branch) is automerged into `swift/master` | |||
| - llvm.org's `master` is automerged into `swift/master-next` | |||
| - llvm.org's release branch *may* be automerged into `swift-x.y-branch`, if they are in sync | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.