Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 21 Apr 2015 21:29:54 -0700
From:      Craig Rodrigues <rodrigc@FreeBSD.org>
To:        freebsd-git@freebsd.org
Subject:   Re: "git mv" and "svn mv" preserved with git-svn?
Message-ID:  <CAG=rPVfCJji0yynics=XUVt1%2BcJzNy4Cc=T974GioC%2BGHbBmZQ@mail.gmail.com>
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>

next in thread | previous in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAG=rPVfCJji0yynics=XUVt1%2BcJzNy4Cc=T974GioC%2BGHbBmZQ>