From owner-freebsd-git@FreeBSD.ORG  Sat Apr 25 07:30:19 2015
Return-Path: <owner-freebsd-git@FreeBSD.ORG>
Delivered-To: freebsd-git@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 E216E543;
 Sat, 25 Apr 2015 07:30:19 +0000 (UTC)
Received: from theravensnest.org (theraven.freebsd.your.org [216.14.102.27])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "cloud.theravensnest.org",
 Issuer "StartCom Class 1 Primary Intermediate Server CA" (not verified))
 by mx1.freebsd.org (Postfix) with ESMTPS id AA2091E4A;
 Sat, 25 Apr 2015 07:30:18 +0000 (UTC)
Received: from [192.168.0.7] (cpc16-cmbg15-2-0-cust60.5-4.cable.virginm.net
 [86.5.162.61]) (authenticated bits=0)
 by theravensnest.org (8.15.1/8.15.1) with ESMTPSA id t3P7UBPf091819
 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
 Sat, 25 Apr 2015 07:30:16 GMT (envelope-from theraven@FreeBSD.org)
X-Authentication-Warning: theravensnest.org: Host
 cpc16-cmbg15-2-0-cust60.5-4.cable.virginm.net [86.5.162.61] claimed to be
 [192.168.0.7]
Content-Type: text/plain; charset=us-ascii
Mime-Version: 1.0 (Mac OS X Mail 8.2 \(2098\))
Subject: Re: Merging GitHub Pull Requests into Subversion using git-svn
From: David Chisnall <theraven@FreeBSD.org>
In-Reply-To: <CAG=rPVdNNsS42D4UVxmokzmxu3F4Kb7wYQnwQnn23g53zzX2Bg@mail.gmail.com>
Date: Sat, 25 Apr 2015 08:30:06 +0100
Cc: freebsd-git@freebsd.org,
 freebsd-current Current <freebsd-current@freebsd.org>,
 ports <freebsd-ports@freebsd.org>
Content-Transfer-Encoding: quoted-printable
Message-Id: <29BE23C6-EBFE-40FB-91FC-C0E7CBFCFD45@FreeBSD.org>
References: <CAG=rPVdNNsS42D4UVxmokzmxu3F4Kb7wYQnwQnn23g53zzX2Bg@mail.gmail.com>
To: Craig Rodrigues <rodrigc@FreeBSD.org>
X-Mailer: Apple Mail (2.2098)
X-BeenThere: freebsd-git@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: Discussion of git use in the FreeBSD project <freebsd-git.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/freebsd-git>,
 <mailto:freebsd-git-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-git/>
List-Post: <mailto:freebsd-git@freebsd.org>
List-Help: <mailto:freebsd-git-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/freebsd-git>,
 <mailto:freebsd-git-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 25 Apr 2015 07:30:20 -0000

On 23 Apr 2015, at 00:12, Craig Rodrigues <rodrigc@FreeBSD.org> wrote:
>=20
> 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). =20

David=