<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="">Hi all,<div class=""><br class=""></div><div class="">I have wrapped up the code reformatting operation for the swift-lldb master and master-next repositories.</div><div class=""><br class=""></div><div class="">Of note:</div><div class=""><br class=""></div><div class="">* The integration of upstream <a href="http://LLVM.org" class="">LLVM.org</a> LLDB svn trunk bits into the swift-lldb/master-next branch happens by way of the swift-lldb/upstream branch. The upstream branch, which was similarly formatted by Kate earlier this week, has had an merge via ‘git merge -s ours origin/upstream’. I had already ensured all changes right up to the svn trunk reformatting were already in master-next. This “-s ours” style merge into master-next, after I reformatted master-next, should provide for smooth merges of new code in svn trunk next time we merge upstream.</div><div class=""><br class=""></div><div class="">* Similarly, swift-lldb/master-next gets the latest Swift-specific LLDB changes from swift-lldb/master. In an identical fashion, swift-lldb/master was independently reformatted, and it was merged back into the master-next branch via a ‘git merge -s ours origin/master’. This should provide for smoother merges of changes that happen after the code reformatting.</div><div class=""><br class=""></div><div class="">* All public CI bots on the swift-lldb master and master next branches are back to blue.</div><div class=""><br class=""></div><div class="">Thanks for your patience. The swift-lldb master and master-next branches are back open for business.</div><div class=""><br class=""></div><div class="">-Todd</div><div class=""><br class=""><div><blockquote type="cite" class=""><div class="">On Sep 7, 2016, at 5:04 PM, Todd Fiala <<a href="mailto:tfiala@apple.com" class="">tfiala@apple.com</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=""><br class=""><div class=""><blockquote type="cite" class=""><div class="">On Sep 7, 2016, at 2:06 PM, Todd Fiala <<a href="mailto:tfiala@apple.com" class="">tfiala@apple.com</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><meta http-equiv="Content-Type" content="text/html charset=us-ascii" class=""><div style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class="">Hi all,<div class=""><br class=""></div><div class="">The <a href="http://llvm.org/" class="">LLVM.org</a> LLDB svn repository has just been reformatted to better match LLVM code formatting standards. For details on that, see these threads:</div><div class=""><br class=""></div><div class=""><div class=""><a href="http://lists.llvm.org/pipermail/lldb-dev/2016-August/010870.html" class="">http://lists.llvm.org/pipermail/lldb-dev/2016-August/010870.html</a></div><div class=""><a href="http://lists.llvm.org/pipermail/lldb-dev/2016-September/011181.html" class="">http://lists.llvm.org/pipermail/lldb-dev/2016-September/011181.html</a></div></div><div class=""><br class=""></div><div class="">I am now doing the mirror task for the GitHub swift-lldb repo. Please avoid checking anything into the swift-lldb repository on the <b class="">master</b> and <b class="">master-next</b> branches until I give an all clear.</div><div class=""><br class=""></div></div></div></blockquote><div class=""><br class=""></div><div class="">Update: the swift-lldb master-next branch is done and is now clear.</div><div class=""><br class=""></div><div class="">I’m now working on the swift-lldb master branch. Please don’t check anything into the master branch until I’m done with it. Thanks!</div><br class=""><blockquote type="cite" class=""><div class=""><div style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class=""><div class="">Thanks!</div><div class=""><br class=""></div><div class="">-Todd</div></div></div></blockquote></div><br class=""></div></div></blockquote></div><br class=""></div></body></html>