<div dir="ltr">I just use the button, too, unless I want to run tests.</div><div class="gmail_extra"><br><br><div class="gmail_quote">On Fri, Aug 8, 2014 at 12:37 AM, Lincoln Baxter, III <span dir="ltr"><<a href="mailto:lincolnbaxter@gmail.com" target="_blank">lincolnbaxter@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">This doesn't add the remote either :)</div><div class="HOEnZb"><div class="h5"><div class="gmail_extra">
<br><br><div class="gmail_quote">On Thu, Aug 7, 2014 at 4:00 PM, Peter Muir <span dir="ltr"><<a href="mailto:pmuir@redhat.com" target="_blank">pmuir@redhat.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div><div><p dir="ltr">What Brian is doing is better IMO. With your approach you avoid a few commands but its just syntactic sugar. You still end up with the same thing in your local git (the remote added and the branch downloaded). </p>
<p dir="ltr">The PR branch is already in the upstream remote but not fetched by default. Brian is fetching from that, avoiding adding the remote.</p>
<p dir="ltr">Though nowadays I've been converted to the way of the big green button.</p><div><div>
<div>On 7 Aug 2014 19:08, "Lincoln Baxter, III" <<a href="mailto:lincolnbaxter@gmail.com" target="_blank">lincolnbaxter@gmail.com</a>> wrote:<br type="attribution"></div><br><div><div dir="ltr">Whatever works for you :) <div>
<br></div><div>You don't need to add the remote, just copy the text from Github... it tells you how to do it right in the PR (just click "Use thh command line" to see the instructions)</div>
<div><br></div><div><pre style="overflow:auto;font-family:Consolas,'Liberation Mono',Menlo,Courier,monospace;font-size:12px;margin-top:0px;margin-bottom:10px;margin-right:25px;padding:10px;color:rgb(255,255,255);border:0px;border-top-left-radius:3px;border-top-right-radius:0px;border-bottom-right-radius:3px;border-bottom-left-radius:3px;background-color:rgb(51,51,51)">
git checkout -b lincolnthree-WINDUP-133 master
git pull <a href="https://github.com/lincolnthree/windup.git" target="_blank">https://github.com/lincolnthree/windup.git</a> WINDUP-133</pre></div><div class="gmail_extra"><br>Then run the tests "mvn clean install", and if they pass:</div>
<div class="gmail_extra"><br></div><div class="gmail_extra"><pre style="overflow:auto;font-family:Consolas,'Liberation Mono',Menlo,Courier,monospace;font-size:12px;margin-top:0px;margin-bottom:10px;margin-right:25px;padding:10px;color:rgb(255,255,255);border:0px;border-top-left-radius:3px;border-top-right-radius:0px;border-bottom-right-radius:3px;border-bottom-left-radius:3px;background-color:rgb(51,51,51)">
git checkout master
git merge --no-ff lincolnthree-WINDUP-133
git push origin master</pre></div><div class="gmail_extra"><br></div><div class="gmail_extra">Hope this helps,</div><div class="gmail_extra">~Lincoln<br><br><div class="gmail_quote">On Sat, Aug 2, 2014 at 7:20 AM, Ondrej Zizka <span dir="ltr"><<a href="mailto:ozizka@redhat.com" target="_blank">ozizka@redhat.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">
<div bgcolor="#FFFFFF" text="#000000">
Here is a script which Brian uses to rebase and merge selected PR's.<br>
Could be handy.<br>
<br>
HTH,<br>
Ondra<br>
<br>
<br>
<div><br>
<br>
-------- Original Message --------
<table border="0" cellpadding="0" cellspacing="0">
<tbody>
<tr>
<th align="RIGHT" nowrap valign="BASELINE">Subject:
</th>
<td>Re: Git pull request automation?</td>
</tr>
<tr>
<th align="RIGHT" nowrap valign="BASELINE">Date: </th>
<td>Tue, 30 Apr 2013 09:47:20 -0500</td>
</tr>
<tr>
<th align="RIGHT" nowrap valign="BASELINE">From: </th>
<td>Brian Stansberry <a href="mailto:brian.stansberry@redhat.com" target="_blank"><brian.stansberry@redhat.com></a></td>
</tr>
<tr>
<th align="RIGHT" nowrap valign="BASELINE">To: </th>
<td>Ondrej Zizka <a href="mailto:ozizka@redhat.com" target="_blank"><ozizka@redhat.com></a></td>
</tr>
<tr>
<th align="RIGHT" nowrap valign="BASELINE">CC: </th>
<td>Carlo de Wolf <a href="mailto:cdewolf@redhat.com" target="_blank"><cdewolf@redhat.com></a></td>
</tr>
</tbody>
</table>
<br>
<br>
<pre>AIUI Carlo's team is building some automation around this for EAP.
I have a simple script I use to bring down a bunch of pull requests into
a single branch.[1] I then push that branch to upstream master-ignore.
Lightning and Tomaz Cerar's team city test that branch whenever changes
are made. If that goes well, I merge the branch to master and push.
The other mergers do similar things, probably with better scripts for
the first bit.
I don't use the requester's remote; the PR is available via the wildfly
github repo. See the script for details.
[1]
pull() {
cmd="git fetch upstream master "
for var in "$@"
do
cmd="$cmd pull/$var/head:pullRequest$var"
done
$cmd
git branch -D pulls
git checkout master
git rebase upstream/master
git checkout -b pulls
for var in "$@"
do
git checkout pullRequest$var
git rebase pulls
git checkout pulls
git merge pullRequest$var
git branch -D pullRequest$var
done
}
On 4/30/13 9:16 AM, Ondrej Zizka wrote:
> Hi Brian,
>
> if I want to test and review the pull request before merging, it seems
> that I have to add the requester's remote, fetch it, check out his
> branch, then do what I want.
>
> With the pace of PRs to AS, I assume you have some automation for this,
> perhaps through GitHub API. Is that available somewhere?
> Or how do you proceed when you need to check something in an IDE, or
> test something not covered by the testsuite, etc?
>
> Thanks,
> Ondra
--
Brian Stansberry
Principal Software Engineer
JBoss by Red Hat
</pre>
<br>
</div>
<br>
</div>
<br>_______________________________________________<br>
windup-dev mailing list<br>
<a href="mailto:windup-dev@lists.jboss.org" target="_blank">windup-dev@lists.jboss.org</a><br>
<a href="https://lists.jboss.org/mailman/listinfo/windup-dev" target="_blank">https://lists.jboss.org/mailman/listinfo/windup-dev</a><br></blockquote></div><br><br clear="all"><div><br></div>-- <br>Lincoln Baxter, III<br>
<a href="http://ocpsoft.org" target="_blank">http://ocpsoft.org</a><br>"Simpler is better."
</div></div>
</div></div></div></div></div><br>_______________________________________________<br>
windup-dev mailing list<br>
<a href="mailto:windup-dev@lists.jboss.org" target="_blank">windup-dev@lists.jboss.org</a><br>
<a href="https://lists.jboss.org/mailman/listinfo/windup-dev" target="_blank">https://lists.jboss.org/mailman/listinfo/windup-dev</a><br></blockquote></div><br><br clear="all"><div><br></div>-- <br>Lincoln Baxter, III<br>
<a href="http://ocpsoft.org" target="_blank">http://ocpsoft.org</a><br>"Simpler is better."
</div>
</div></div></blockquote></div><br><br clear="all"><div><br></div>-- <br>Lincoln Baxter, III<br><a href="http://ocpsoft.org" target="_blank">http://ocpsoft.org</a><br>"Simpler is better."
</div>