> On Feb 9, 2017, at 12:09 PM, Jordan Rose via swift-dev <swift-dev@swift.org> > wrote: > > Hi, Chris. I’m a bit confused by these changes. Swift’s master-next isn’t > paired with upstream-with-swift; it’s paired with stable-next, which is > resync’d to upstream-with-swift on a fairly regular cadence. Have you > discussed this with the “merge czars” on the Swift side, who maintain > master-next and stable-next?
This has been discussed with the “merge czars”, and we may end up creating a stable-next branch, but Bob Wilson suggested that they were considering changes to the merge process that would eliminate the need for that branch. > > “upstream-with-trunk” is redundant; the “upstream” referred to in > “upstream-with-swift” is LLVM trunk. “upstream-plus-swift-support” might have > been a better name for the LLVM branch. I mis-wrote that. It is “upstream-with-swift” not trunk. The LLDB “upstream” branch will be going away because it is unnecessary to maintain a branch that matches LLVM.org <http://llvm.org/>. > > What happens on the LLDB “stable" branch? No development happens on LLVM or > Clang’s “stable” branch; they’re essentially just aliases for the latest > release branch. Does the LLDB “stable” branch build against Swift master or > Swift’s latest release branch? LLDB’s stable branch will be maintained in exactly the same way LLVM & Clang’s stable branches are. So it is currently identical to the swift-4.0-branch. > > When I change something on Swift master that affects LLDB, where do I send a > pull request going forward? It would be very painful for Swift developers to > have a master-next/stable-next build set up just to submit changes to LLDB; > today, most Swift developers don’t even need to think about master-next > unless something breaks. Patches to LLDB for swift-related functionality should go into the most current release branch, in the same way we handle LLVM & Clang changes. -Chris > > Concerned, > Jordan > > >> On Feb 9, 2017, at 10:50, Chris Bieneman via swift-lldb-dev >> <swift-lldb-...@swift.org <mailto:swift-lldb-...@swift.org>> wrote: >> >> Hello Swift-Dev and Swift-LLDB-Dev, >> >> Over the last couple weeks we’ve been working on some changes to the branch >> management strategy for the Swift-LLDB repository. The goal is to have LLDB >> more closely align with the other projects forked from LLVM.org >> <http://llvm.org/>. We believe that making this change will simplify the >> contribution process for LLDB’s Swift support. >> >> To this end, we are making the following changes: >> >> LLDB has gained an upstream-with-trunk branch which will be auto-merged from >> LLVM.org <http://llvm.org/>’s LLDB/trunk. This branch will contain the best >> of both worlds. The latest and greatest from LLVM.org <http://llvm.org/>, >> and Swift support. This branch will pair to LLVM & Clang’s >> upstream-with-swift branches and Swift’s master-next. >> >> LLDB has also gained a stable branch which will behave the same way as the >> LLVM & Clang stable branches, and should be used for most Swift compiler >> development. Additionally we have made the swift-lldb/stable branch the >> default branch on the GitHub repository, which matches the behavior of LLVM >> & Clang. >> >> LLDB’s master and master-next branches will be going away. Later today we >> will lock the branches, and in a few days we’ll delete them. For most users >> you’ll want to migrate from Swift-LLDB/master to Swift-LLDB/stable. >> >> The new branches are already created, and the tooling will be coming online >> over the next few days. Additionally, the Swift contributing page >> (https://swift.org/contributing/#llvm-and-swift >> <https://swift.org/contributing/#llvm-and-swift>) has been updated to >> reflect the alignment of the LLDB process with the other LLVM.org >> <http://llvm.org/> projects. >> >> If you have any questions about the new process or the transition please let >> me know. >> >> Thank you, >> -Chris >> _______________________________________________ >> swift-lldb-dev mailing list >> swift-lldb-...@swift.org <mailto:swift-lldb-...@swift.org> >> https://lists.swift.org/mailman/listinfo/swift-lldb-dev > > _______________________________________________ > swift-dev mailing list > swift-dev@swift.org > https://lists.swift.org/mailman/listinfo/swift-dev
_______________________________________________ swift-dev mailing list swift-dev@swift.org https://lists.swift.org/mailman/listinfo/swift-dev
