From owner-freebsd-git@FreeBSD.ORG Wed Apr 22 00:53:38 2015
Return-Path: <owner-freebsd-git@FreeBSD.ORG>
Delivered-To: freebsd-git@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 0541D79E;
Wed, 22 Apr 2015 00:53:38 +0000 (UTC)
Received: from mail-lb0-x234.google.com (mail-lb0-x234.google.com
[IPv6:2a00:1450:4010:c04::234])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(Client CN "smtp.gmail.com",
Issuer "Google Internet Authority G2" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 8252A1442;
Wed, 22 Apr 2015 00:53:37 +0000 (UTC)
Received: by lbbzk7 with SMTP id zk7so168403886lbb.0;
Tue, 21 Apr 2015 17:53:35 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
h=mime-version:sender:date:message-id:subject:from:to:cc:content-type;
bh=bxCKbDY8dcpQa4degSOCy19xC0Mz7MN2fbj15cwvluM=;
b=nSH2+hVqxjKFhN4UDSN2/nSyDlFPfUm/OKHZuOuz23MOVJ/MzcrXqCgKOO5ephnUaL
FRGLa8AuichkwagEiNLGAF3Ba2cns/aQoDxQov8yxSKxjzJ7NkKxgCNwI0hzkJNSwUw5
FhQSPrjGhHYbSSLVSIeoAL1v92f8QO7lsAMvnTT3kRSwDOC+4JYQzmXfbdYXlX5IJlz+
r4XCNNNgLQttEUFUFI+L839Cb7MS9PnharGtNa8qICIVngg2YlVx0uuYUj54tQxV869a
dfBNo3NnVPlHTZ3VraH0r4dA2bgQvTMiXadvKkZuaFu+yMJljl4Ji9JoQmBONfJ8IhWC
S4Jg==
MIME-Version: 1.0
X-Received: by 10.152.44.161 with SMTP id f1mr22341758lam.26.1429664015769;
Tue, 21 Apr 2015 17:53:35 -0700 (PDT)
Sender: crodr001@gmail.com
Received: by 10.112.164.38 with HTTP; Tue, 21 Apr 2015 17:53:35 -0700 (PDT)
Date: Tue, 21 Apr 2015 17:53:35 -0700
X-Google-Sender-Auth: ZRmLFEtJ2coEAphvgiTjMUTHT94
Message-ID: <CAG=rPVftZp4nd7Zk-E__piOOvs1t3S1oEqV7j6E9zrdjwT3XGA@mail.gmail.com>
Subject: "git mv" and "svn mv" preserved with git-svn?
From: Craig Rodrigues <rodrigc@FreeBSD.org>
To: freebsd-git@freebsd.org
Content-Type: text/plain; charset=ISO-8859-1
X-Content-Filtered-By: Mailman/MimeDel 2.1.20
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: Wed, 22 Apr 2015 00:53:38 -0000
If someone submits a github pull request that does "git mv",
will these translate properly to "svn mv" if the following workflow is
followed?
https://wiki.freebsd.org/GitWorkflow#Using_git-svn_.28FreeBSD_committers_only.29
Specifically, I am looking at this:
https://github.com/freebsd/freebsd/pull/28
--
Craig
From owner-freebsd-git@FreeBSD.ORG Wed Apr 22 02:03:33 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 249F21B0;
Wed, 22 Apr 2015 02:03:33 +0000 (UTC)
Received: from mail-la0-x22a.google.com (mail-la0-x22a.google.com
[IPv6:2a00:1450:4010:c03::22a])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(Client CN "smtp.gmail.com",
Issuer "Google Internet Authority G2" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id CB2811AC9;
Wed, 22 Apr 2015 02:03:32 +0000 (UTC)
Received: by laat2 with SMTP id t2so164292228laa.1;
Tue, 21 Apr 2015 19:03:30 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
h=mime-version:sender:in-reply-to:references:date:message-id:subject
:from:to:cc:content-type;
bh=CxWGCagx5zPVrB/I1b3RJ3tYqWofweITmou4F00WQEY=;
b=n0S1HeaRX/jvrERqdcR8Y7v9sln1eK/4VXan4Si47FtBgeNj8HA03lDwqKXtY73doJ
Z5wS2VZ0ZytzqMGWDa515GpnzSM3CVTJpphL/AbwQdbVUzqExD5jOo2yWh8MIPLHPmbC
Akk5qkSZmf5/98k27mrPV4crGHQbkFiXWDbfKlemNODwuXriWGU9fkNazvLhsGp0D8n6
1hijGfkTfbRwGewgTLlH0yHKxtbhS9Y8CkUTW0/HW6VyYIRvQKHkSaYN9FHx0aveRteX
G3jAyIXHjTjbpbdoOYwCBDGAgSgmLwtWlL3tFXXdEgEfXJpcyjEjvwWtq/jK9gP9j+Be
+Xvg==
MIME-Version: 1.0
X-Received: by 10.112.132.9 with SMTP id oq9mr2496236lbb.26.1429668210632;
Tue, 21 Apr 2015 19:03:30 -0700 (PDT)
Sender: crodr001@gmail.com
Received: by 10.112.164.38 with HTTP; Tue, 21 Apr 2015 19:03:30 -0700 (PDT)
In-Reply-To: <CAG=rPVftZp4nd7Zk-E__piOOvs1t3S1oEqV7j6E9zrdjwT3XGA@mail.gmail.com>
References: <CAG=rPVftZp4nd7Zk-E__piOOvs1t3S1oEqV7j6E9zrdjwT3XGA@mail.gmail.com>
Date: Tue, 21 Apr 2015 19:03:30 -0700
X-Google-Sender-Auth: 8bYAosVjdkk1kQr_RahvenwQ4PM
Message-ID: <CAG=rPVcFo7ofxLVq6puidsoKsiKdrCiNSa0G5PFEW_Twtvxo=g@mail.gmail.com>
Subject: Re: "git mv" and "svn mv" preserved with git-svn?
From: Craig Rodrigues <rodrigc@FreeBSD.org>
To: freebsd-git@freebsd.org
Content-Type: text/plain; charset=ISO-8859-1
X-Content-Filtered-By: Mailman/MimeDel 2.1.20
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: Wed, 22 Apr 2015 02:03:33 -0000
On Tue, Apr 21, 2015 at 5:53 PM, Craig Rodrigues <rodrigc@freebsd.org>
wrote:
>
> If someone submits a github pull request that does "git mv",
> will these translate properly to "svn mv" if the following workflow is
> followed?
>
>
> https://wiki.freebsd.org/GitWorkflow#Using_git-svn_.28FreeBSD_committers_only.29
>
> Specifically, I am looking at this:
> https://github.com/freebsd/freebsd/pull/28
>
> --
> Craig
>
Stackoverflow says that "git mv" should be preserved as "svn mv" with "git
svn dcommit":
http://stackoverflow.com/questions/5652521/does-git-svn-handle-moved-files
but I just wanted to verify with someone else before I try it.
--
Craig
From owner-freebsd-git@FreeBSD.ORG Wed Apr 22 04:29:57 2015
Return-Path: <owner-freebsd-git@FreeBSD.ORG>
Delivered-To: freebsd-git@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 5E1A83CB;
Wed, 22 Apr 2015 04:29:57 +0000 (UTC)
Received: from mail-la0-x231.google.com (mail-la0-x231.google.com
[IPv6:2a00:1450:4010:c03::231])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(Client CN "smtp.gmail.com",
Issuer "Google Internet Authority G2" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id D65261996;
Wed, 22 Apr 2015 04:29:56 +0000 (UTC)
Received: by laat2 with SMTP id t2so165890868laa.1;
Tue, 21 Apr 2015 21:29:55 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
h=mime-version:sender:in-reply-to:references:date:message-id:subject
:from:to:cc:content-type;
bh=ZPK6I7mtYTT5fFB6k4gSBGPiOQlhjynmbmQPy9AXqi0=;
b=0UFgpSsu4CD98sDYSoMQBH0XZWzcjl5l9RBUXGLGJUf1MlESFpSHBZSIklpB2jhDfi
MhQuK3RiDfmRuehWbIqGqVrzP1NAoYG77QdEzc+WWqlGQ1PdRjf2JkMW6LT8Jkzrs/JZ
Kayk3ssXnrcvSvLQDnCD5Z4nmKXotIxRoGJEGjwWpeEieJWZliz7EoAhxGoUIpVIVMDP
mnyKplq5xuHjjwCjALvvhth2eTdJHWIb5fjeTGme9jruAq6X5HrasjadM0sa0nQ5vK13
kiUMKTvGtb8b+MZfzKJX8VvNcAgggK+OTYmy3VSEGUQqU+9RFrftJUSJSlEyXzdOMrcT
Oymg==
MIME-Version: 1.0
X-Received: by 10.152.170.170 with SMTP id an10mr22847497lac.84.1429676994797;
Tue, 21 Apr 2015 21:29:54 -0700 (PDT)
Sender: crodr001@gmail.com
Received: by 10.112.164.38 with HTTP; Tue, 21 Apr 2015 21:29:54 -0700 (PDT)
In-Reply-To: <CAG=rPVcFo7ofxLVq6puidsoKsiKdrCiNSa0G5PFEW_Twtvxo=g@mail.gmail.com>
References: <CAG=rPVftZp4nd7Zk-E__piOOvs1t3S1oEqV7j6E9zrdjwT3XGA@mail.gmail.com>
<CAG=rPVcFo7ofxLVq6puidsoKsiKdrCiNSa0G5PFEW_Twtvxo=g@mail.gmail.com>
Date: Tue, 21 Apr 2015 21:29:54 -0700
X-Google-Sender-Auth: yY4WdoSZdsT5tlvzf2Dm2rVPfyU
Message-ID: <CAG=rPVfCJji0yynics=XUVt1+cJzNy4Cc=T974GioC+GHbBmZQ@mail.gmail.com>
Subject: Re: "git mv" and "svn mv" preserved with git-svn?
From: Craig Rodrigues <rodrigc@FreeBSD.org>
To: freebsd-git@freebsd.org
Content-Type: text/plain; charset=ISO-8859-1
X-Content-Filtered-By: Mailman/MimeDel 2.1.20
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: Wed, 22 Apr 2015 04:29:57 -0000
On Tue, Apr 21, 2015 at 7:03 PM, Craig Rodrigues <rodrigc@freebsd.org>
wrote:
>
>
> On Tue, Apr 21, 2015 at 5:53 PM, Craig Rodrigues <rodrigc@freebsd.org>
> wrote:
>
>>
>> If someone submits a github pull request that does "git mv",
>> will these translate properly to "svn mv" if the following workflow is
>> followed?
>>
>>
>> https://wiki.freebsd.org/GitWorkflow#Using_git-svn_.28FreeBSD_committers_only.29
>>
>> Specifically, I am looking at this:
>> https://github.com/freebsd/freebsd/pull/28
>>
>> --
>> Craig
>>
>
> Stackoverflow says that "git mv" should be preserved as "svn mv" with "git
> svn dcommit":
> http://stackoverflow.com/questions/5652521/does-git-svn-handle-moved-files
>
> but I just wanted to verify with someone else before I try it.
>
>
I ran some experiments with git-svn, and it looks like it *does* translate
git mv to svn mv:
$ git svn dcommit
Committing to file:///opt2/home/rodrigc/dummyrepo ...
R kerberos5/Makefile => kerberos5/tools/slc/Makefile2
Committed r6
D kerberos5/Makefile
A kerberos5/tools/slc/Makefile2
In the original svn repo, if I did: svn log kerberos5/tools/sc/Makefile,
the history of the original file before the mv was preserved.
--
Craig
From owner-freebsd-git@FreeBSD.ORG Wed Apr 22 15:21:12 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 C5D3F4C0;
Wed, 22 Apr 2015 15:21:12 +0000 (UTC)
Received: from mail-la0-x235.google.com (mail-la0-x235.google.com
[IPv6:2a00:1450:4010:c03::235])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(Client CN "smtp.gmail.com",
Issuer "Google Internet Authority G2" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 65F141DDB;
Wed, 22 Apr 2015 15:21:12 +0000 (UTC)
Received: by lagv1 with SMTP id v1so177630203lag.3;
Wed, 22 Apr 2015 08:21:10 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
h=mime-version:sender:in-reply-to:references:date:message-id:subject
:from:to:cc:content-type;
bh=VUSEBUxMLuYdFb688wNcks4Icho4VWCGvJYzjxJplWg=;
b=ybZmVSuUVBUf6Z99H9O292vY07V4Qo23MBdHCakB+OmdIjsGdE8tpSl6vlkVdVllZH
Rk9mKGeCOucwA64qW0BamuT8aHiidelad0SXmNfnnOgvG2DpGFdTJq+W/mKkmqz2ctER
XvLoYYWLnKDrIGtEke0tcsmn2Mb6Nn3UnUr+VJAFGDSrdhOADmDkYhWhyz1lbyKPaBok
HMCosZR2E+LkcHfR8fuq/oeTRsPWtmQ4XsP6ZQOXg4fpQX1NaJXcczxM+Qc7CGovdYF0
1kwEtpZ+SlehTGQnBpYoVIPTunHwYT589ZaPKgexzFW+y/wvOSnlcRxHrT0huymS4CPy
86eg==
MIME-Version: 1.0
X-Received: by 10.112.167.73 with SMTP id zm9mr1860535lbb.89.1429716070310;
Wed, 22 Apr 2015 08:21:10 -0700 (PDT)
Sender: crodr001@gmail.com
Received: by 10.112.164.38 with HTTP; Wed, 22 Apr 2015 08:21:10 -0700 (PDT)
In-Reply-To: <CAG=rPVfCJji0yynics=XUVt1+cJzNy4Cc=T974GioC+GHbBmZQ@mail.gmail.com>
References: <CAG=rPVftZp4nd7Zk-E__piOOvs1t3S1oEqV7j6E9zrdjwT3XGA@mail.gmail.com>
<CAG=rPVcFo7ofxLVq6puidsoKsiKdrCiNSa0G5PFEW_Twtvxo=g@mail.gmail.com>
<CAG=rPVfCJji0yynics=XUVt1+cJzNy4Cc=T974GioC+GHbBmZQ@mail.gmail.com>
Date: Wed, 22 Apr 2015 08:21:10 -0700
X-Google-Sender-Auth: QXAAi2Hc6WxwEFKi9eCgK1avjYE
Message-ID: <CAG=rPVfNQusubKPr7-R_8Jf=HZE9tqZrvk+Bjow2itgzLsqMAg@mail.gmail.com>
Subject: Re: "git mv" and "svn mv" preserved with git-svn?
From: Craig Rodrigues <rodrigc@FreeBSD.org>
To: freebsd-git@freebsd.org
Content-Type: text/plain; charset=ISO-8859-1
X-Content-Filtered-By: Mailman/MimeDel 2.1.20
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: Wed, 22 Apr 2015 15:21:12 -0000
Hi,
I used git svn dcommit to commit this changeset:
https://lists.freebsd.org/pipermail/svn-src-all/2015-April/102918.html
I can confirm that "git mv" is preserved across "git svn dcommit",
and the history of the moved files is preserved across the move.
--
Craig
From owner-freebsd-git@FreeBSD.ORG Wed Apr 22 23:13:02 2015
Return-Path: <owner-freebsd-git@FreeBSD.ORG>
Delivered-To: freebsd-git@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 1C9D64C4;
Wed, 22 Apr 2015 23:13:02 +0000 (UTC)
Received: from mail-la0-x22b.google.com (mail-la0-x22b.google.com
[IPv6:2a00:1450:4010:c03::22b])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(Client CN "smtp.gmail.com",
Issuer "Google Internet Authority G2" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 971CE1311;
Wed, 22 Apr 2015 23:13:01 +0000 (UTC)
Received: by lagv1 with SMTP id v1so855323lag.3;
Wed, 22 Apr 2015 16:12:59 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
h=mime-version:sender:date:message-id:subject:from:to:cc:content-type;
bh=G9sW6xAQx3aT2f/DYvsSHQuSP683Hy4TLfEUTZYxYXY=;
b=l8C7AAImJc4dUyhKhlIvglGqpK1g5DQqDfeVpyEWqwNGtWO8eFoSTcxw9vYhqYBm3F
IhurV7fXo4/D2KzHS8tzMyre94A50Qv4Fd9zeplNVrm3WURsi3Ouy1/1UQfuRmD0EfDp
3KhvEQyoY6Lk1gE4IzFiSBV6HpNN3vy9xhd97C+J0A2U+UFioHS+G3NrfEpwScMzeBy1
i+O+WnX0kqhSroZxqTq97yh+KBz4T4QnHXefINTzHgInRkQVgUNtWepQD8B4FIS8ikPJ
w/93Q86xJqe7NKNGglgkNL49IJfgCUiJtVe1w19AkP3OrjdE30n8Jl9nEMffWTu2MeuU
QPrA==
MIME-Version: 1.0
X-Received: by 10.113.10.134 with SMTP id ea6mr26392914lbd.29.1429744379551;
Wed, 22 Apr 2015 16:12:59 -0700 (PDT)
Sender: crodr001@gmail.com
Received: by 10.112.164.38 with HTTP; Wed, 22 Apr 2015 16:12:59 -0700 (PDT)
Date: Wed, 22 Apr 2015 16:12:59 -0700
X-Google-Sender-Auth: 2L9BANvdSWvbzneo490_a8ujHlU
Message-ID: <CAG=rPVdNNsS42D4UVxmokzmxu3F4Kb7wYQnwQnn23g53zzX2Bg@mail.gmail.com>
Subject: Merging GitHub Pull Requests into Subversion using git-svn
From: Craig Rodrigues <rodrigc@FreeBSD.org>
To: freebsd-git@freebsd.org
Cc: freebsd-current Current <freebsd-current@freebsd.org>,
ports <freebsd-ports@freebsd.org>
Content-Type: text/plain; charset=ISO-8859-1
X-Content-Filtered-By: Mailman/MimeDel 2.1.20
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: Wed, 22 Apr 2015 23:13:02 -0000
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
From owner-freebsd-git@FreeBSD.ORG Sat Apr 25 02:53:21 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 E699DF27;
Sat, 25 Apr 2015 02:53:21 +0000 (UTC)
Received: from elvis.mu.org (elvis.mu.org [192.203.228.196])
by mx1.freebsd.org (Postfix) with ESMTP id D35C913A9;
Sat, 25 Apr 2015 02:53:21 +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 17B5D341F841;
Fri, 24 Apr 2015 19:53:21 -0700 (PDT)
Message-ID: <553B01A4.1060309@freebsd.org>
Date: Fri, 24 Apr 2015 19:53:24 -0700
From: Alfred Perlstein <alfred@freebsd.org>
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 <rodrigc@FreeBSD.org>, freebsd-git@freebsd.org
Subject: Re: "git mv" and "svn mv" preserved with git-svn?
References: <CAG=rPVftZp4nd7Zk-E__piOOvs1t3S1oEqV7j6E9zrdjwT3XGA@mail.gmail.com> <CAG=rPVcFo7ofxLVq6puidsoKsiKdrCiNSa0G5PFEW_Twtvxo=g@mail.gmail.com> <CAG=rPVfCJji0yynics=XUVt1+cJzNy4Cc=T974GioC+GHbBmZQ@mail.gmail.com>
<CAG=rPVfNQusubKPr7-R_8Jf=HZE9tqZrvk+Bjow2itgzLsqMAg@mail.gmail.com>
In-Reply-To: <CAG=rPVfNQusubKPr7-R_8Jf=HZE9tqZrvk+Bjow2itgzLsqMAg@mail.gmail.com>
Content-Type: text/plain; charset=windows-1252; format=flowed
Content-Transfer-Encoding: 7bit
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 02:53:22 -0000
On 4/22/15 8:21 AM, Craig Rodrigues wrote:
> Hi,
>
> I used git svn dcommit to commit this changeset:
>
> https://lists.freebsd.org/pipermail/svn-src-all/2015-April/102918.html
>
> I can confirm that "git mv" is preserved across "git svn dcommit",
> and the history of the moved files is preserved across the move.
> --
> Craig
>
Nice work Craig, any time to update the wiki to reflect that?
-Alfred
From owner-freebsd-git@FreeBSD.ORG Sat Apr 25 02:54:50 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 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 <alfred@freebsd.org>
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 <rodrigc@FreeBSD.org>, freebsd-git@freebsd.org
CC: freebsd-current Current <freebsd-current@freebsd.org>,
ports <freebsd-ports@freebsd.org>
Subject: Re: Merging GitHub Pull Requests into Subversion using git-svn
References: <CAG=rPVdNNsS42D4UVxmokzmxu3F4Kb7wYQnwQnn23g53zzX2Bg@mail.gmail.com>
In-Reply-To: <CAG=rPVdNNsS42D4UVxmokzmxu3F4Kb7wYQnwQnn23g53zzX2Bg@mail.gmail.com>
Content-Type: text/plain; charset=windows-1252; format=flowed
Content-Transfer-Encoding: 7bit
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 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"
>
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=