Hi all, I have wrapped up the code reformatting operation for the swift-lldb master and master-next repositories.
Of note: * The integration of upstream LLVM.org <http://llvm.org/> 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. * 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. * All public CI bots on the swift-lldb master and master next branches are back to blue. Thanks for your patience. The swift-lldb master and master-next branches are back open for business. -Todd > On Sep 7, 2016, at 5:04 PM, Todd Fiala <tfi...@apple.com> wrote: > > >> On Sep 7, 2016, at 2:06 PM, Todd Fiala <tfi...@apple.com >> <mailto:tfi...@apple.com>> wrote: >> >> Hi all, >> >> The LLVM.org <http://llvm.org/> LLDB svn repository has just been >> reformatted to better match LLVM code formatting standards. For details on >> that, see these threads: >> >> http://lists.llvm.org/pipermail/lldb-dev/2016-August/010870.html >> <http://lists.llvm.org/pipermail/lldb-dev/2016-August/010870.html> >> http://lists.llvm.org/pipermail/lldb-dev/2016-September/011181.html >> <http://lists.llvm.org/pipermail/lldb-dev/2016-September/011181.html> >> >> I am now doing the mirror task for the GitHub swift-lldb repo. Please avoid >> checking anything into the swift-lldb repository on the master and >> master-next branches until I give an all clear. >> > > Update: the swift-lldb master-next branch is done and is now clear. > > 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! > >> Thanks! >> >> -Todd >
_______________________________________________ swift-lldb-dev mailing list swift-lldb-dev@swift.org https://lists.swift.org/mailman/listinfo/swift-lldb-dev
