From owner-freebsd-git@FreeBSD.ORG Wed Apr 22 04:29:57 2015 Return-Path: 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: References: Date: Tue, 21 Apr 2015 21:29:54 -0700 X-Google-Sender-Auth: yY4WdoSZdsT5tlvzf2Dm2rVPfyU Message-ID: Subject: Re: "git mv" and "svn mv" preserved with git-svn? From: Craig Rodrigues 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Apr 2015 04:29:57 -0000 On Tue, Apr 21, 2015 at 7:03 PM, Craig Rodrigues wrote: > > > On Tue, Apr 21, 2015 at 5:53 PM, Craig Rodrigues > 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