<html><head><meta http-equiv="Content-Type" content="text/html charset=utf-8"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class=""><div class="">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 <i class="">fairly</i> regular cadence. Have you discussed this with the “merge czars” on the Swift side, who maintain master-next and stable-next?</div><div class=""><br class=""></div><div class="">“upstream-with-trunk” is redundant; the “upstream” referred to in “upstream-with-swift” <i class="">is</i> LLVM trunk. “upstream-plus-swift-support” might have been a better name for the LLVM branch.</div><div class=""><br class=""></div><div class="">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?</div><div class=""><br class=""></div><div class="">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.</div><div class=""><br class=""></div><div class="">Concerned,</div><div class="">Jordan</div><div class=""><br class=""></div><br class=""><div><blockquote type="cite" class=""><div class="">On Feb 9, 2017, at 10:50, Chris Bieneman via swift-lldb-dev <<a href="mailto:swift-lldb-dev@swift.org" class="">swift-lldb-dev@swift.org</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><meta http-equiv="Content-Type" content="text/html charset=utf-8" class=""><div style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class="">Hello Swift-Dev and Swift-LLDB-Dev,<div class=""><br class=""></div><div class="">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 <a href="http://llvm.org/" class="">LLVM.org</a>. We believe that making this change will simplify the contribution process for LLDB’s Swift support.</div><div class=""><br class=""></div><div class="">To this end, we are making the following changes:</div><div class=""><br class=""></div><div class="">LLDB has gained an upstream-with-trunk branch which will be auto-merged from <a href="http://llvm.org/" class="">LLVM.org</a>’s LLDB/trunk. This branch will contain the best of both worlds. The latest and greatest from <a href="http://llvm.org/" class="">LLVM.org</a>, and Swift support. This branch will pair to LLVM & Clang’s upstream-with-swift branches and Swift’s master-next.</div><div class=""><br class=""></div><div class="">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.</div><div class=""><br class=""></div><div class="">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.</div><div class=""><br class=""></div><div class="">The new branches are already created, and the tooling will be coming online over the next few days. Additionally, the Swift contributing page (<a href="https://swift.org/contributing/#llvm-and-swift" class="">https://swift.org/contributing/#llvm-and-swift</a>) has been updated to reflect the alignment of the LLDB process with the other <a href="http://llvm.org/" class="">LLVM.org</a> projects.</div><div class=""><br class=""></div><div class="">If you have any questions about the new process or the transition please let me know.</div><div class=""><br class=""></div><div class="">Thank you,</div><div class="">-Chris</div></div>_______________________________________________<br class="">swift-lldb-dev mailing list<br class=""><a href="mailto:swift-lldb-dev@swift.org" class="">swift-lldb-dev@swift.org</a><br class="">https://lists.swift.org/mailman/listinfo/swift-lldb-dev<br class=""></div></blockquote></div><br class=""></body></html>