Re: Merging GitHub Pull Requests into Subversion using git-svn

2015-04-27 Thread Alfred Perlstein
[[ reply private ]] On 4/25/15 12:30 AM, David Chisnall wrote: On 23 Apr 2015, at 00:12, Craig Rodrigues wrote: While not as smooth as clicking a merge button in GitHub, this is a valid way to accept patches submitted via GitHub pull requests, and integrate them in our FreeBSD Subversion repo

Re: Merging GitHub Pull Requests into Subversion using git-svn

2015-04-25 Thread David Chisnall
On 23 Apr 2015, at 00:12, Craig Rodrigues wrote: > > While not as smooth as clicking a merge button in GitHub, > this is a valid way to accept patches submitted via GitHub pull requests, > and integrate them in our FreeBSD Subversion repo. The merge button on GitHub does the wrong thing anyway (

Re: Merging GitHub Pull Requests into Subversion using git-svn

2015-04-24 Thread Alfred Perlstein
Very cool. Glad it worked and thanks for the shout-out. Hoping this can be automated some day. On 4/22/15 4:12 PM, Craig Rodrigues wrote: Hi, Alfred Perlstein recently wrote this document for how to use git-svn for interacting between the FreeBSD Subversion repo, and the GitHub mirror of this

Merging GitHub Pull Requests into Subversion using git-svn

2015-04-22 Thread Craig Rodrigues
Hi, Alfred Perlstein recently wrote this document for how to use git-svn for interacting between the FreeBSD Subversion repo, and the GitHub mirror of this repo: https://wiki.freebsd.org/GitWorkflow/GitSvn By following the steps in that article, step-by-step, I was able to: (1) take these thre