<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 Shawn,</div><div class=""><br class=""></div>I’ve done the following:<div class=""><ul class="MailOutline"><li class="">Merged latest stable into llvm/swift-3-indexing-model</li><li class="">Merged latest stable into clang/swift-3-indexing-model</li><li class="">Merged latest swift-3-api-guidelines into swift/swift-3-indexing-model (there was Just One Conflict! in CMakeFiles.txt)</li></ul><div class=""><br class=""></div></div><div class="">swift/utils/build-script -R gives no errors, which, I assume, is a success at this point =)</div><div class=""><br class=""></div><div class="">max</div><div class=""><br class=""></div><div class=""><br class=""></div><div class=""><div><blockquote type="cite" class=""><div class="">On Mar 1, 2016, at 3:33 PM, Shawn Erickson <<a href="mailto:shawnce@gmail.com" class="">shawnce@gmail.com</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><div dir="ltr" class=""><div class="">I am back and starting to work on this effort again.</div><div class=""><br class=""></div><div class="">I think it may be time to get swift/swift-3-indexing-model branch in Apple's repo updated to the latest stable from swift-3-api-guidelines. I can then merge the latest into my changes.</div><div class=""><br class=""></div><div class="">Also it may be time to see if the following two branches of llvm and clang that I have been using are still up-to-date enough. Things appear to be working but just wondering if I am missing out on some improvements, etc.</div><div class=""><br class=""></div><div class="">--- Updating '/Users/shawnce/Documents/Development/apple_swift/llvm' ---</div><div class="">Current branch swift-3-indexing-model is up to date.</div><div class="">--- Updating '/Users/shawnce/Documents/Development/apple_swift/clang' ---</div><div class="">Current branch swift-3-indexing-model is up to date.</div><div class=""><br class=""></div><div class="">I will need help of Apple folks to get these branches moved forward (likely cleaner then me doing that in forks of my own).</div><div class=""><div class=""><br class=""></div></div></div>
</div></blockquote></div><br class=""></div></body></html>