Merging GitHub Pull Requests into Subversion using git-svn

Alfred Perlstein alfred at freebsd.org
Sat Apr 25 02:54:50 UTC 2015


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 repo:
>
> https://wiki.freebsd.org/GitWorkflow/GitSvn
>
> By following the steps in that article, step-by-step,
> I was able to:
>
> (1)  take these three GitHub pull requests from Steve Kiernan:
>
> https://github.com/freebsd/freebsd/pull/26
> https://github.com/freebsd/freebsd/pull/27
> https://github.com/freebsd/freebsd/pull/28
>
> (2)  Pull them into my own git checkout of the FreeBSD src tree
>
> (3)  Modify the commit message slightly
>
> (4)  Use "git svn dcommit" to push these changes directly from my Git tree
> back to the
>        FreeBSD svn repo:
>
> https://svnweb.freebsd.org/changeset/base/281844
> https://svnweb.freebsd.org/changeset/base/281845
> https://svnweb.freebsd.org/changeset/base/281855
>
> While there were multiple steps involved, I just followed the steps in the
> wiki article, and it *just worked*!  Thanks for writing this article,
> Alfred!
>
> 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.
>
> --
> Craig
> _______________________________________________
> freebsd-ports at freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/freebsd-ports
> To unsubscribe, send any mail to "freebsd-ports-unsubscribe at freebsd.org"
>


More information about the freebsd-current mailing list