Is there a way to "git svn dcommit" from a cloned git-svn repository :

Question

I have several branches in my svn, sometimes it is very small branch and it is nice to have it in the same directory, but sometimes these branches grow big and it is nice to move the whole thing to another folder.

But when I do a git clone from this local repository to another place on my disk git-svn lost all its information and I don't known how to connect it back. I suppose I could just make a copy of the folder, but doing it through git would be nicer.

idbrii · Accepted Answer · 2023-10-03 20:29:14Z

14

Once you've cloned a git-svn repo, you can pull in the information you need by running git svn init with the same parameters as the original repo was created with. According to the WebKit git-svn instructions, the trick is to use update-ref to get yourself to a state where you can fast-forward to the tip of the SVN tree:

git svn init -T trunk http://svn.webkit.org/repository/webkit
git update-ref refs/remotes/trunk origin/master

The exact parameters passed to git svn init depend on the setup of your Subversion repo and git-svn clone.

edited Oct 3, 2023 at 20:29

idbrii

12.2k5 gold badges72 silver badges124 bronze badges

answered Apr 9, 2009 at 21:27

Brian Campbell

335k59 gold badges367 silver badges344 bronze badges

Sign up to request clarification or add additional context in comments.

2 Comments

jstevenco Over a year ago

Yup -- it should. +1 for the Webkit ref, tho' -- told me exactly what I needed to know.

arand Over a year ago

In order to avoid references to the "origin" remote, it appears possible to use simply "master" instead of "origin/master". And if you did not init with -T trunk, the first argument would be "refs/remotes/git-svn"

mipadi · Accepted Answer · 2009-04-09 13:39:26Z

3

Unfortunately not, as git-clone does not clone the git-svn information when performing a clone. You can read more about the situation here.

answered Apr 9, 2009 at 13:39

mipadi

414k91 gold badges538 silver badges488 bronze badges

Comments

David Cournapeau · Accepted Answer · 2009-10-07 10:46:33Z

1

It is possible, but you have to set things up a bit differently. Here is how we do it on numpy - the repo was created with git-svn-automirror

You can look at the function _git_update_mirror to see how to do it manually

answered Oct 7, 2009 at 10:46

David Cournapeau

81.1k9 gold badges69 silver badges72 bronze badges

1 Comment

inger Over a year ago

So the point is to make sure the remote refs (which normally look refs/remotes/origin/*), should be 'refs/remotes/* to coincide with those that git-svn uses (by default: svn-remote.svn.branches=branches/*:refs/remotes/*) ?

idbrii · Accepted Answer · 2023-10-03 20:59:22Z

I got this working! This is my elaboration on @Brian Campbell's answer but I also include how I initially setup my checkouts to make differences from your setup more clear.

On one computer, fetch all history and push it to a (pre-configured) git remote.

:: This init command must be the same on all machines
git svn init --trunk=https://[email protected]/svn/proj https://[email protected]/svn/proj proj
cd proj
git remote add mine https://git.us.ca/idbrii/proj.git

:: Get history the beginning of this project.
git svn fetch -r 306842:HEAD

git push --set-upstream mine main

To connect any other computer: use the same init, fetch a tiny bit of history, fetch git history, and then splice them together.

If your git remote name isn't mine or your svn setup is different, the remote and ref names might differ.

git svn init --trunk=https://[email protected]/svn/proj https://[email protected]/svn/proj proj
cd proj
git remote add mine https://git.us.ca/idbrii/proj.git

:: Only fetch a bit of history. This is enough to configure git-svn but doesn't
:: take too long. *Don't* fetch HEAD so svn rebase actually does something.
git svn fetch -r 560851:575104
git fetch mine
git reset --hard mine/main
:: Verify the remote name is correct before proceeding. If not, look around inside remotes.
dir .git\refs\remotes\origin\trunk
git update-ref refs/remotes/origin/trunk main
git svn rebase

The last command should end with output like this:

Partial-rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.a8370998-ac15-0410-90df-bdb97e9fde4a ...
Currently at 575104 = 5978493cb8514a8517er552480da4e799d96cb317a795a4
r306842 = 5813acf515009930838f199cfbf6356ee670a245
...
r552484 = b765e78c3a7ad4cd5fb9946623ea763dfdef4574
r552488 = 67b823895920ccbc3ce256099c6065d17e1a2728
r560851 = 83350d598bf94c1f5c49fd22e99c8d3dd80604d5
r575104 = 25cb9009d5b666d1df668069cb993f3beb2f60b2
r575209 = 10ef809b5073fa3a799b98671c499199c1851c95
r575300 = 15164c67df7c22da03e4f4564a76994852a9f608
Done rebuilding .git/svn/refs/remotes/origin/trunk/.rev_map.a8370998-ac15-0410-90df-bdb97e9fde4a
Successfully rebased and updated refs/heads/main.

That goes really fast so it seems to be just verifying we have the correct data and not re-downloading the commit data.

davetron5000 · Accepted Answer · 2009-04-09 21:06:23Z

-1

The svn info is not much more than a few bits of info in the .git/config file, right? You could just hand-jam those and be good to go.

answered Apr 9, 2009 at 21:06

davetron5000

25k11 gold badges75 silver badges99 bronze badges

Collectives™ on Stack Overflow

Is there a way to "git svn dcommit" from a cloned git-svn repository :

5 Answers 5

2 Comments

Comments

1 Comment

Comments

Comments

Your Answer

Linked

Hot Network Questions

Collectives™ on Stack Overflow

5 Answers 5

2 Comments

Comments

1 Comment

Comments

Comments

Your Answer

Sign up or log in

Post as a guest

Linked

Related