Skip to content

Add note that LLDB changes should be cherry-picked to swift/master #32133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 4, 2020
Merged

Add note that LLDB changes should be cherry-picked to swift/master #32133

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d2477d9
Add note that LLDB changes should be cherry-picked to `swift/master`
martinboehme Jun 2, 2020
0e9aa24
New Swift-dependent commits should go to `swift/master`, not `swift/m…
martinboehme Jun 3, 2020
a7ce978
Update naming scheme for release branches
martinboehme Jun 3, 2020
f2cf2a6
Merge branch 'master' into martinboehme-patch-1
martinboehme Jun 3, 2020
99ae476
Fix indentation
martinboehme Jun 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions docs/Branches.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,17 +58,20 @@ You can use any of the branch names as the argument to `--scheme`, such as `mast

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

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).
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).

... 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
[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.
- 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.

Note that **no new changes should be submitted directly to `apple/master`**. We are actively working on eliminating the differences from upstream LLVM.
Note that **no new changes should be submitted directly to `apple/master`**. We are actively working on eliminating the differences from upstream LLVM.

2) Changes that depend on Swift (this only applies to LLDB)
- New commits go to `swift/master` (_not_ an `apple/stable/*` branch, as these shouldn't contain changes that depend on Swift).

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

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

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.

Expand Down