<div dir="ltr">The revert of the merge was done here:<div><br></div><blockquote style="margin:0 0 0 40px;border:none;padding:0px"><div><div>commit 0c0701210828a9280d4ded63b087efc9cc74003a</div></div><div><div>Author: Todd Fiala <<a href="mailto:todd.fiala@gmail.com">todd.fiala@gmail.com</a>></div></div><div><div>Date: Fri Feb 19 22:41:30 2016 -0800</div></div><div><div><br></div></div><div><div> undo the <a href="http://llvm.org">llvm.org</a> lldb svn trunk merge</div></div><div><div><br></div></div></blockquote><div><a href="http://ci.swift.org">ci.swift.org</a> 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.</div><div><br></div><div>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.</div><div><br></div><div>Thanks!</div><div><br></div><div>Sincerely,</div><div>Todd Fiala</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Feb 19, 2016 at 10:04 PM, Todd Fiala <span dir="ltr"><<a href="mailto:todd.fiala@gmail.com" target="_blank">todd.fiala@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">Hi all,<div><br></div><div>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.</div><div><br></div><div>Sorry for the trouble, folks.</div><div><br></div><div>-Todd</div></div><div class="gmail_extra"><div><div class="h5"><br><div class="gmail_quote">On Fri, Feb 19, 2016 at 6:00 PM, Todd Fiala via swift-lldb-dev <span dir="ltr"><<a href="mailto:swift-lldb-dev@swift.org" target="_blank">swift-lldb-dev@swift.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">This merge has broken a few things for the cmake build on Linux. I will be addressing that now.<br>
<br>
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.<br>
<br>
Thanks!<br>
<span><font color="#888888"><br>
-Todd<br>
</font></span><div><div><br>
> On Feb 19, 2016, at 5:10 PM, Todd Fiala <<a href="mailto:tfiala@apple.com" target="_blank">tfiala@apple.com</a>> wrote:<br>
><br>
> Hi all,<br>
><br>
> Just an FYI, <a href="http://llvm.org" rel="noreferrer" target="_blank">llvm.org</a> lldb svn trunk from r260951 has just been merged into swift-lldb master.<br>
><br>
> Thanks!<br>
><br>
> -Todd<br>
<br>
_______________________________________________<br>
swift-lldb-dev mailing list<br>
<a href="mailto:swift-lldb-dev@swift.org" target="_blank">swift-lldb-dev@swift.org</a><br>
<a href="https://lists.swift.org/mailman/listinfo/swift-lldb-dev" rel="noreferrer" target="_blank">https://lists.swift.org/mailman/listinfo/swift-lldb-dev</a><br>
</div></div></blockquote></div><br><br clear="all"><div><br></div></div></div><span class="HOEnZb"><font color="#888888">-- <br><div><div dir="ltr">-Todd</div></div>
</font></span></div>
</blockquote></div><br><br clear="all"><div><br></div>-- <br><div class="gmail_signature"><div dir="ltr">-Todd</div></div>
</div>