From owner-freebsd-current@FreeBSD.ORG Sat Apr 25 02:54:50 2015 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 36117F50; Sat, 25 Apr 2015 02:54:50 +0000 (UTC) Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by mx1.freebsd.org (Postfix) with ESMTP id 235BF13AE; Sat, 25 Apr 2015 02:54:49 +0000 (UTC) Received: from u10-2-32-011.office.norse-data.com (unknown [50.204.88.51]) by elvis.mu.org (Postfix) with ESMTPSA id A3374341F841; Fri, 24 Apr 2015 19:54:49 -0700 (PDT) Message-ID: <553B01FD.5010301@freebsd.org> Date: Fri, 24 Apr 2015 19:54:53 -0700 From: Alfred Perlstein Organization: FreeBSD User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.10; rv:31.0) Gecko/20100101 Thunderbird/31.6.0 MIME-Version: 1.0 To: Craig Rodrigues , freebsd-git@freebsd.org CC: freebsd-current Current , ports Subject: Re: Merging GitHub Pull Requests into Subversion using git-svn References: In-Reply-To: Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Apr 2015 02:54:50 -0000 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@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-ports > To unsubscribe, send any mail to "freebsd-ports-unsubscribe@freebsd.org" >