[beanutils] Merge pull request sent via GitHub, but src in SVN

classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

[beanutils] Merge pull request sent via GitHub, but src in SVN

Bruno P. Kinoshita-3
Hi,


We have a pending pull request for [beanutils] https://github.com/apache/commons-beanutils/pull/3

As the component is still using Subversion, I am not able to use my normal workflow to merge the pull request (i.e. clone the ASF upstream, checkout GitHub remote branch, merge, push).

What are the steps to merge a pull request sent via GitHub, for components using Subversion? Should someone simply apply it manually (i.e. edit the code, or maybe generate a patch from the git repository)?

I believe the commit message must contain "This closes #123" as well, in order to close the PR?

Thanks
Bruno

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: [beanutils] Merge pull request sent via GitHub, but src in SVN

sebb-2-2
On 6 April 2017 at 13:16, Bruno P. Kinoshita
<[hidden email]> wrote:
> Hi,
>
>
> We have a pending pull request for [beanutils] https://github.com/apache/commons-beanutils/pull/3
>
> As the component is still using Subversion, I am not able to use my normal workflow to merge the pull request (i.e. clone the ASF upstream, checkout GitHub remote branch, merge, push).
>
> What are the steps to merge a pull request sent via GitHub, for components using Subversion? Should someone simply apply it manually (i.e. edit the code, or maybe generate a patch from the git repository)?

It's trivial to change a PR into a patch; just append '.patch':

https://patch-diff.githubusercontent.com/raw/apache/commons-beanutils/pull/3.patch

This can then be applied to SVN as normal.

> I believe the commit message must contain "This closes #123" as well, in order to close the PR?

I think so.

> Thanks
> Bruno
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: [hidden email]
> For additional commands, e-mail: [hidden email]
>

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]

Reply | Threaded
Open this post in threaded view
|

Re: [beanutils] Merge pull request sent via GitHub, but src in SVN

garydgregory
I would use a diff file like
https://patch-diff.githubusercontent.com/raw/apache/commons-beanutils/pull/3.diff


Whether you use a diff or patch file depends on your tooling.

I would add a comment "Closes #123" in your commit comment along with a
comment that refers to a JIRA ticket. That will close the PR.

I'm not sure what we should do in the long run about duplicating PRs and
JIRAs.

Gary

On Thu, Apr 6, 2017 at 6:30 AM, sebb <[hidden email]> wrote:

> On 6 April 2017 at 13:16, Bruno P. Kinoshita
> <[hidden email]> wrote:
> > Hi,
> >
> >
> > We have a pending pull request for [beanutils]
> https://github.com/apache/commons-beanutils/pull/3
> >
> > As the component is still using Subversion, I am not able to use my
> normal workflow to merge the pull request (i.e. clone the ASF upstream,
> checkout GitHub remote branch, merge, push).
> >
> > What are the steps to merge a pull request sent via GitHub, for
> components using Subversion? Should someone simply apply it manually (i.e.
> edit the code, or maybe generate a patch from the git repository)?
>
> It's trivial to change a PR into a patch; just append '.patch':
>
> https://patch-diff.githubusercontent.com/raw/
> apache/commons-beanutils/pull/3.patch
>
> This can then be applied to SVN as normal.
>
> > I believe the commit message must contain "This closes #123" as well, in
> order to close the PR?
>
> I think so.
>
> > Thanks
> > Bruno
> >
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: [hidden email]
> > For additional commands, e-mail: [hidden email]
> >
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: [hidden email]
> For additional commands, e-mail: [hidden email]
>
>


--
E-Mail: [hidden email] | [hidden email]
Java Persistence with Hibernate, Second Edition
<https://www.amazon.com/gp/product/1617290459/ref=as_li_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=1617290459&linkCode=as2&tag=garygregory-20&linkId=cadb800f39946ec62ea2b1af9fe6a2b8>

<http:////ir-na.amazon-adsystem.com/e/ir?t=garygregory-20&l=am2&o=1&a=1617290459>
JUnit in Action, Second Edition
<https://www.amazon.com/gp/product/1935182021/ref=as_li_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=1935182021&linkCode=as2&tag=garygregory-20&linkId=31ecd1f6b6d1eaf8886ac902a24de418%22>

<http:////ir-na.amazon-adsystem.com/e/ir?t=garygregory-20&l=am2&o=1&a=1935182021>
Spring Batch in Action
<https://www.amazon.com/gp/product/1935182951/ref=as_li_tl?ie=UTF8&camp=1789&creative=9325&creativeASIN=1935182951&linkCode=%7B%7BlinkCode%7D%7D&tag=garygregory-20&linkId=%7B%7Blink_id%7D%7D%22%3ESpring+Batch+in+Action>
<http:////ir-na.amazon-adsystem.com/e/ir?t=garygregory-20&l=am2&o=1&a=1935182951>
Blog: http://garygregory.wordpress.com
Home: http://garygregory.com/
Tweet! http://twitter.com/GaryGregory
Reply | Threaded
Open this post in threaded view
|

Re: [beanutils] Merge pull request sent via GitHub, but src in SVN

Bruno P. Kinoshita-3
Thanks Gary & sebb. Downloaded the patch from GitHub (TIL!), and applied with `patch apply -p1 -i ~/3.patch`


I included the "Closes #3" text in the commit message, but looks like SVN repositories take a bit longer to sync.  GitHub repo should be updated in some minutes/hours, and hopefully the pull request will be marked as merged too.

Cheers
Bruno




________________________________
From: Gary Gregory <[hidden email]>
To: Commons Developers List <[hidden email]>
Cc: Bruno P. Kinoshita <[hidden email]>
Sent: Friday, 7 April 2017 5:40 AM
Subject: Re: [beanutils] Merge pull request sent via GitHub, but src in SVN



I would use a diff file like https://patch-diff.githubusercontent.com/raw/apache/commons-beanutils/pull/3.diff 

Whether you use a diff or patch file depends on your tooling.
I would add a comment "Closes #123" in your commit comment along with a comment that refers to a JIRA ticket. That will close the PR.

I'm not sure what we should do in the long run about duplicating PRs and JIRAs.

Gary


On Thu, Apr 6, 2017 at 6:30 AM, sebb <[hidden email]> wrote:

On 6 April 2017 at 13:16, Bruno P. Kinoshita

><[hidden email]. invalid> wrote:
>> Hi,
>>
>>
>> We have a pending pull request for [beanutils] https://github.com/apache/ commons-beanutils/pull/3
>>
>> As the component is still using Subversion, I am not able to use my normal workflow to merge the pull request (i.e. clone the ASF upstream, checkout GitHub remote branch, merge, push).
>>
>> What are the steps to merge a pull request sent via GitHub, for components using Subversion? Should someone simply apply it manually (i.e. edit the code, or maybe generate a patch from the git repository)?
>
>It's trivial to change a PR into a patch; just append '.patch':
>
>https://patch-diff. githubusercontent.com/raw/ apache/commons-beanutils/pull/ 3.patch
>
>This can then be applied to SVN as normal.
>
>> I believe the commit message must contain "This closes #123" as well, in order to close the PR?
>
>I think so.
>
>
>> Thanks
>> Bruno
>>
>> ------------------------------ ------------------------------ ---------
>> To unsubscribe, e-mail: dev-unsubscribe@commons. apache.org
>> For additional commands, e-mail: [hidden email]
>>
>
>------------------------------ ------------------------------ ---------
>To unsubscribe, e-mail: dev-unsubscribe@commons. apache.org
>For additional commands, e-mail: [hidden email]
>
>


--

E-Mail: [hidden email] | [hidden email]
Java Persistence with Hibernate, Second Edition
JUnit in Action, Second Edition
Spring Batch in Action
Blog: http://garygregory.wordpress.com 
Home: http://garygregory.com/
Tweet! http://twitter.com/GaryGregory

---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]