<div dir="ltr">Is there a way to have this show up in the git pull pages?<div><br></div><div style>In regards to:</div><div style><a href="https://github.com/D-Programming-Language/phobos/pull/1694">https://github.com/D-Programming-Language/phobos/pull/1694</a><br>
</div><div style><br></div><div style>You said:</div><div style>> I'm removing the auto-merge tag on this commit until the JSON_TYPE comments are cleaned up.</div><div><br></div><div style>But when I reviewed, I was un-aware it was about to be merged, and did not remove the tag. There should be a visual queue on the pull page, and a mail should be sent, in the same way one is sent when a pull is merged.</div>
<div style><br></div><div style>Other than that, I like it.</div></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Fri, Nov 15, 2013 at 9:17 AM, Brad Roberts <span dir="ltr"><<a href="mailto:braddr@puremagic.com" target="_blank">braddr@puremagic.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">I've just put the automated pull merging code into production and visible to everyone. The rough details:<br>
<br>
1) You have to be logged in and using https (should be automatic) -- note the new login link in the upper left corner. The website is now integrated with github's oauth system and will direct you over there to accept this login. It requires write credentials because the merge operation is performed as the person who requests the merge. This is subject to debate. It's possible to switch to read-only credentials and have all merges done as me, with a merge comment noting who did the commit -- but I prefer it NOT be me but rather be you guys.<br>
<br>
2) To request that a pull be merged, head through link on the page with all the pull requests and their status (<a href="https://d.puremagic.com/test-results/pulls.ghtml?projectid=1" target="_blank">https://d.puremagic.com/test-<u></u>results/pulls.ghtml?projectid=<u></u>1</a>) to the test history link (second column.. the one with the username/branch titled link). At the top of that page, for anyone (logged in or not) is a new row labeled "Auto Merge" with a yes/no indicator. If you're logged in you will see a Toggle link.<br>
<br>
3) For any request which is already completely tested, it will merge right then and there (though no visual indicator on that page until a few minutes later when the system has detected the completed merge). For any incompletely tested pull request, once it passes all 10 platforms, it will be merged in.<br>
<br>
4) If the pull is updated to a new revision while waiting for a complete set of tests to pass, then the auto-merge state is dropped and must be re-enabled.<br>
<br>
Two known issues:<br>
<br>
1) the post-login step is always back at the default page rather than where you were when you logged in.<br>
<br>
2) anyone who is logged in can toggle it. Once the pull passes all tests, when it tries to perform the pull, it notices the requester can't and yanks the flag, not performing any merging. Since someone who could have rightly set it will be mislead that it had been set, that's pretty ugly.<br>
<br>
There's every possibility that there's bugs in the system, so please tread carefully and let me know if you see something acting fishy. Future work will add more integration with github to make it easier to interact with.<br>
<br>
Happy merging,<br>
Brad<br>
<br>
(yes, I realize those docs, such as they are, really belong within the website.. it's on the list)<br>
______________________________<u></u>_________________<br>
phobos mailing list<br>
<a href="mailto:phobos@puremagic.com" target="_blank">phobos@puremagic.com</a><br>
<a href="http://lists.puremagic.com/mailman/listinfo/phobos" target="_blank">http://lists.puremagic.com/<u></u>mailman/listinfo/phobos</a><br>
</blockquote></div><br></div>