<div dir="ltr">Austin I made some progress on bring together our efforts. The following pull request outlines the changes so far. I will keep at it so the PR may change some before I finally deliver it into my fork's swift-3-indexing-model branch.<div><br></div><div><a href="https://github.com/shawnce/swift/pull/3">https://github.com/shawnce/swift/pull/3</a></div><div><br></div><div>-Shawn</div><div></div></div><br><div class="gmail_quote"><div dir="ltr">On Mon, Feb 22, 2016 at 1:31 PM Austin Zheng <<a href="mailto:austinzheng@gmail.com">austinzheng@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">Sounds good, thanks for adding me to the repo. If you have more time than me and are itching to get moving, I'm also happy to let you take the lead - LMK what you prefer. In any case I'm going to spend some time reading code and understanding the specifics of the new collections system better.</div><div dir="ltr"><div><div><br></div><div>Austin</div></div></div><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Feb 22, 2016 at 1:18 PM, Shawn Erickson <span dir="ltr"><<a href="mailto:shawnce@gmail.com" target="_blank">shawnce@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"><span><p style="margin:0px;line-height:normal;font-family:Helvetica"><span style="line-height:normal;font-family:'Helvetica Neue'">OK I am made the command decision to proceed on merging what Austin has done and what I have done so far. I decided to pull Austin's work onto the "</span>swift-3-indexing-model-az1" branch in my fork <a href="https://github.com/shawnce/swift/" target="_blank"><span style="color:rgb(126,87,194)">https://github.com/shawnce/swift/</span></a>. I will work this afternoon on bringing my branch and his branch closer together.</p>
<p style="margin:0px;line-height:normal;font-family:Helvetica;min-height:16px"><br></p>
<p style="margin:0px;line-height:normal;font-family:Helvetica">I added Austin as a collaborator in my fork for now and I will add the known Apple folks just incase you want to work in our temporary sandbox.</p>
<p style="margin:0px;line-height:normal;font-family:Helvetica;min-height:16px"><br></p>
<p style="margin:0px;line-height:normal;font-family:Helvetica">I will keep branches in my fork synced with the upstream branches from apple/swift as we progress. At some point when things are less broken a PR can be used to move WIP up to apple/swift.</p><p style="margin:0px;line-height:normal;font-family:Helvetica"><br></p><p style="margin:0px;line-height:normal;font-family:Helvetica">Let me know if you have an concerns.</p><span><font color="#888888">
<p style="margin:0px;line-height:normal;font-family:Helvetica;min-height:16px"><br></p>
<p style="margin:0px;line-height:normal;font-family:Helvetica">-Shawn</p></font></span></span><br></div><div><div><br><div class="gmail_quote"><div dir="ltr">On Mon, Feb 22, 2016 at 10:42 AM Austin Zheng <<a href="mailto:austinzheng@gmail.com" target="_blank">austinzheng@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div style="word-wrap:break-word">What I have can be found here. All the TODOs will eventually be removed: <a href="https://github.com/austinzheng/swift/commit/950e49268b37ca9b0a9643834e8d877b90759971" target="_blank">https://github.com/austinzheng/swift/commit/950e49268b37ca9b0a9643834e8d877b90759971</a><div><br></div><div>I must leave for work now, but welcome any comments etc.</div></div><div style="word-wrap:break-word"><div><br></div><div>Austin</div></div><div style="word-wrap:break-word"><div><br><div><blockquote type="cite"><div>On Feb 22, 2016, at 10:34 AM, Austin Zheng <<a href="mailto:austinzheng@gmail.com" target="_blank">austinzheng@gmail.com</a>> wrote:</div><br><div><div style="word-wrap:break-word"><br><div><blockquote type="cite"><div>On Feb 22, 2016, at 7:54 AM, Dave Abrahams <<a href="mailto:dabrahams@apple.com" target="_blank">dabrahams@apple.com</a>> wrote:</div><br><div><br style="font-family:Helvetica;font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px"><span style="font-family:Helvetica;font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px;float:none;display:inline!important">on Sun Feb 21 2016, Austin Zheng <</span><a href="http://austinzheng-at-gmail.com/" style="font-family:Helvetica;font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px" target="_blank">austinzheng-AT-gmail.com</a><span style="font-family:Helvetica;font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px;float:none;display:inline!important">> wrote:</span><br style="font-family:Helvetica;font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px"><br style="font-family:Helvetica;font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px"><blockquote type="cite" style="font-family:Helvetica;font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px">I copy-pasted the prototype code into Collections.swift (commenting<br>out the old code),<span> </span><br></blockquote><br style="font-family:Helvetica;font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px"><span style="font-family:Helvetica;font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px;float:none;display:inline!important">Request: don't comment out old code; it just makes a mess and makes</span><br style="font-family:Helvetica;font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px"><span style="font-family:Helvetica;font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px;float:none;display:inline!important">changesets harder to analyze. The old code is still available; that's</span><br style="font-family:Helvetica;font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px"><span style="font-family:Helvetica;font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px;float:none;display:inline!important">what Git is for.</span><br style="font-family:Helvetica;font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px"><br style="font-family:Helvetica;font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px"></div></blockquote><div><br></div><div>Of course, you mentioned this before. I'll make sure it goes away.</div><br><blockquote type="cite"><div><blockquote type="cite" style="font-family:Helvetica;font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px">renamed the types that conflicted with the naming guidelines, and am<br>going through the errors one at a time to get the project into a<br>buildable state. This might take a few more days. Let me know if there<br>are any objections to this approach.<br></blockquote><br style="font-family:Helvetica;font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px"><span style="font-family:Helvetica;font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px;float:none;display:inline!important">None whatsoever. If you can push your WIP to some publicly-visible</span><br style="font-family:Helvetica;font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px"><span style="font-family:Helvetica;font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px;float:none;display:inline!important">repository, maybe you could find a way to share the effort of fixing</span><br style="font-family:Helvetica;font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px"><span style="font-family:Helvetica;font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px;float:none;display:inline!important">errors with Shawn...?</span><br style="font-family:Helvetica;font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px"></div></blockquote><div><br></div><div>I'll push what I have to my local repo, but it's a very brute-force approach. Like Shawn, I don't know if this is the *best* way; if necessary we can go with his more methodical approach.</div><div><br></div><div>Austin</div><br><blockquote type="cite"><div><br style="font-family:Helvetica;font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px"><blockquote type="cite" style="font-family:Helvetica;font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px"><br>Austin<br><br><blockquote type="cite">On Feb 21, 2016, at 6:21 PM, Dave Abrahams <<a href="mailto:dabrahams@apple.com" target="_blank">dabrahams@apple.com</a>> wrote:<br><br>Until we open commit access, they still need one or more repos to<br>push to and create PRs from. Seems better for them to have an org<br>repo for that so other collaborators have a centralized place to go<br>for the latest non-integrated work.<br><br>Sent from my moss-covered three-handled family gradunza<br><br><blockquote type="cite">On Feb 21, 2016, at 5:34 PM, Austin Zheng <<a href="mailto:austinzheng@gmail.com" target="_blank">austinzheng@gmail.com</a>> wrote:<br><br>Hi Dmitri (et al),<br><br>I have no personal objection to pull requests. If PRs directly to<br>the Swift project are the best way to do things, let's keep it that<br>way.<br><br>Austin<br><br><blockquote type="cite">On Feb 21, 2016, at 5:24 PM, Dmitri Gribenko <<a href="mailto:gribozavr@gmail.com" target="_blank">gribozavr@gmail.com</a>> wrote:<br><br>On Sun, Feb 21, 2016 at 12:13 PM, Austin Zheng <<a href="mailto:austinzheng@gmail.com" target="_blank">austinzheng@gmail.com</a>> wrote:<br><blockquote type="cite">Agreed. I created a GitHub organization<br>('swift-stdlib-opensource-collaborators'), and will try to invite the<br>non-Apple ('outsider') folks to join. Once that's happened, maybe Shawn can<br>move his fork under the organization, or one of us can fork the repo again.<br></blockquote><br>Hi Austin, Shawn,<br><br>We're still working out the general policy for commit access for<br>non-Apple contributors.<br><br>I'm trying to understand the situation better -- could you explain why<br>pull requests present too much overhead for this project? Many Apple<br>engineers who have commit access find that the pull request approach<br>works better for their day-to-day work.<br><br>My concern is that doing this work in a parallel organization hides<br>this project from other contributors who might be interested. Also,<br>you would only get CI coverage in the primary Swift organization. In<br>general, creating a parallel organization sends an ambiguous message<br>to other people working on the project.<br><br>Furthermore, even Shawn started his work on this project with a pull<br>request against his fork (<a href="https://github.com/shawnce/swift/pull/1" target="_blank">https://github.com/shawnce/swift/pull/1</a>).<br><br>Could we start with pull requests against the swift-3-indexing-model<br>branch in the primary repository, and possibly move to direct commits<br>later?<br><br>Dmitri<br><br>--<span> </span><br>main(i,j){for(i=2;;i++){for(j=2;j<i;j++){if(!(i%j)){j=0;break;}}if<br>(j){printf("%d\n",i);}}} /*Dmitri Gribenko <<a href="mailto:gribozavr@gmail.com" target="_blank">gribozavr@gmail.com</a>>*/<br></blockquote><br></blockquote></blockquote></blockquote><br style="font-family:Helvetica;font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px"><span style="font-family:Helvetica;font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px;float:none;display:inline!important">--<span> </span></span><br style="font-family:Helvetica;font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px"><span style="font-family:Helvetica;font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;letter-spacing:normal;text-align:start;text-indent:0px;text-transform:none;white-space:normal;word-spacing:0px;float:none;display:inline!important">-Dave</span></div></blockquote></div><br></div></div></blockquote></div><br></div></div></blockquote></div>
</div></div></blockquote></div><br></div>
</blockquote></div>