commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Gary Gregory <garydgreg...@gmail.com>
Subject Re: [beanutils] Merge pull request sent via GitHub, but src in SVN
Date Thu, 06 Apr 2017 17:40:23 GMT
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 <sebbaz@gmail.com> wrote:

> On 6 April 2017 at 13:16, Bruno P. Kinoshita
> <brunodepaulak@yahoo.com.br.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: dev-help@commons.apache.org
> >
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@commons.apache.org
> For additional commands, e-mail: dev-help@commons.apache.org
>
>


-- 
E-Mail: garydgregory@gmail.com | ggregory@apache.org
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

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message