ansaurus

Question

git-svn problem

Answer 1

+1 A:

Yes. It should work just fine. I cloned the Mono project repository (over 140k revisions) using the following commands:

$ mkdir mono
$ cd mono
$ git init
$ git svn init svn+ssh://[email protected]/source
$ git config svn-remote.svn.fetch trunk/mono:refs/remotes/git-svn/trunk
$ git config svn-remote.svn.branches branches/*/mono:refs/remotes/git-svn/branches/*
$ git config svn-remote.svn.tags tags/*/mono:refs/remotes/git-svn/tags/*
$ git fetch git://repo.or.cz/mono.git refs/heads/master:refs/remotes/git-svn/trunk refs/heads/branches/*:refs/remotes/git-svn/branches/* refs/tags/*:refs/remotes/git-svn/tags/*
$ git reset --hard git-svn/trunk

and everything went ok. Is that similar to what you're doing?

Gonzalo 2009-11-11 04:28:10

Lol, thats nothing like what I am doing. That looks way above my git competence level (:

corydoras 2009-11-16 21:56:51

All the extra parameters are just to support having all the branches and tags from subversion being different branches in git. You can skip those. No magic involved :)

Gonzalo 2009-11-16 22:05:15

Answer 2

+1 A:

This happened a lot to me. I just re-ran exactly the same git command again and it continued from where it left off. Eventually it gets to the end and everything works.

Edit: If this problem happens when running git svn clone ..., then you want to replace clone with fetch when you rerun the command.

Lachlan 2009-11-11 04:29:36

I tried this, and it failed with the following message: error: More than one value for the key svn-remote.svn.fetch: :refs/remotes/git-svn

l0b0 2009-11-12 09:13:34

Check the [svn-remote "svn"] section of your .git/config file and make sure the fetch entry (or entries) look ok.

Lachlan 2009-11-13 01:00:02

Re-running the command again gives the same error as 'l0b0' has.

corydoras 2009-11-16 21:56:16

Answer 3

A:

Worked out the answer. There must be some sort of bug when using the version of git that comes with ubuntu. The following line appeared twice in the newly created .git/config file:

svn-remote.svn.fetch=:refs/remotes/git-svn
svn-remote.svn.fetch=:refs/remotes/git-svn

Removing the duplicate has allowed me to type a git svn fetch which seems to be continuing the checkout.

corydoras 2009-11-16 23:11:07

I think the reason for this is that the command you tried to rerun was "svn clone", which is basically "svn init" followed by "svn fetch". So I should have said "re-run git svn fetch". I had so much trouble with this that I got into the habit of always doing init then fetch by hand.

Lachlan 2009-11-17 06:43:31

I think you are right. I have to challenge the idea that it is ok for a git command to put something in the config file that is actually broken. If a new git user accidentally types the wrong command it shouldn't break the repository completely. (Unless break it was what they were trying to do)

corydoras 2009-11-19 22:19:39

ansaurus

tags:

views:

answers:

git-svn problem

related questions