Re: Merging GitHub Pull Requests into Subversion using git-svn
[[ 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. The merge button on GitHub does the wrong thing anyway (merges without fast-forward, so you end up with a tangled history), so (after the initial setup) the steps that I use for merging pull requests from GitHub projects are very similar (locally pull the branch with fast-fordward, test, push). Not to bikeshed this, but you really almost never want a fast-forward commit. The reason is that it becomes challenging to git-bisect things to sort out where a bad commit was. In addition then the merge is actually one "atomic" commit. Getting over viewing "merge commits" as "messy" was the final hurdle I faced going towards git-nirvana. -Alfred ___ freebsd-current@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-current To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"
Re: Merging GitHub Pull Requests into Subversion using git-svn
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 (merges without fast-forward, so you end up with a tangled history), so (after the initial setup) the steps that I use for merging pull requests from GitHub projects are very similar (locally pull the branch with fast-fordward, test, push). David ___ freebsd-current@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-current To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"
Re: Merging GitHub Pull Requests into Subversion using git-svn
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-po...@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-ports To unsubscribe, send any mail to "freebsd-ports-unsubscr...@freebsd.org" ___ freebsd-current@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-current To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"
Merging GitHub Pull Requests into Subversion using git-svn
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-current@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-current To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"
