[swift-lldb-dev] swift-lldb master merge update
todd.fiala at gmail.com
Sat Feb 20 02:07:15 CST 2016
The revert of the merge was done here:
Author: Todd Fiala <todd.fiala at gmail.com>
Date: Fri Feb 19 22:41:30 2016 -0800
undo the llvm.org lldb svn trunk merge
ci.swift.org for Ubuntu 14.04 and Ubuntu 15.10 confirm they are back in
shape. The OS X builder will not pick up the change until after its
current build in progress completes and it starts again. That builder
appears to have a failing test both before and after the merge revert, so
it may still be red. I'll handle that separately.
I plan to reapply the merge after I get some time to address some linkage
issues on the Ubuntu side. I plan to use our pull request build testing to
avoid this next time.
On Fri, Feb 19, 2016 at 10:04 PM, Todd Fiala <todd.fiala at gmail.com> wrote:
> Hi all,
> There are too many things broken on Ubuntu. That is going to take time to
> resolve. I am going to revert out several commits that made up this merge.
> Sorry for the trouble, folks.
> On Fri, Feb 19, 2016 at 6:00 PM, Todd Fiala via swift-lldb-dev <
> swift-lldb-dev at swift.org> wrote:
>> This merge has broken a few things for the cmake build on Linux. I will
>> be addressing that now.
>> Please do not try to revert the existing changes as they go across
>> several commits and will be complicated to untangle. I will work to
>> resolve it ASAP.
>> > On Feb 19, 2016, at 5:10 PM, Todd Fiala <tfiala at apple.com> wrote:
>> > Hi all,
>> > Just an FYI, llvm.org lldb svn trunk from r260951 has just been merged
>> into swift-lldb master.
>> > Thanks!
>> > -Todd
>> swift-lldb-dev mailing list
>> swift-lldb-dev at swift.org
-------------- next part --------------
An HTML attachment was scrubbed...
More information about the swift-lldb-dev