Comments on: How to convert from Subversion to Git

By: Albert

Albert — Wed, 10 Feb 2010 22:53:58 +0000

Hey - this might help for creating tags from branches:

git branch -r | awk ‘{ print “git tag “$1″ tags/”$1 ” && git branch -r -d tags/”$1 }’

By: Matt

Matt — Thu, 21 Jan 2010 16:47:22 +0000

Thanks a lot — this is a very helpful no-nonsense guide!

By: W-Mark Kubacki

W-Mark Kubacki — Fri, 02 Oct 2009 13:15:50 +0000

If you have more than one repository, this loop might help you finding all users:

for R in repo1 repo2 repo3 …; do svn log –quiet file:///var/svn/$R | grep ^r | cut -d ‘|’ -f 2; done | sort -u

By: Rodrigo

Rodrigo — Tue, 22 Sep 2009 20:22:27 +0000

I’m getting the following error on step 3
Found possible branch point: http://svn2.xp-dev.com/svn/oncemade-cssSys/trunk => http://svn2.xp-dev.com/svn/oncemade-cssSys/tags/ModernBrowsers, 62
Use of uninitialized value in substitution (s///) at /opt/local/libexec/git-core/git-svn line 1657.
Use of uninitialized value in concatenation (.) or string at /opt/local/libexec/git-core/git-svn line 1657.
refs/remotes/trunk: ‘http://svn2.xp-dev.com/svn/oncemade-cssSys’ not found in ”

how can I fix it?

Thanks!

By: Paul Dowman

Paul Dowman — Thu, 10 Sep 2009 16:01:53 +0000

Thanks Jason, I’ve fixed that. As you said, the formatting was messed up, it had actual angle-bracket characters instead of HTML entities.

By: Jason L

Jason L — Thu, 10 Sep 2009 15:39:53 +0000

FYI - for the “authors.txt” file, the blog post ate the email part of it (because of the greater-than less-than brackets). It should be:

username = John Doe (less-than bracket)some.email@example.com(greater-than bracket)

Thanks for the article!

By: Paul Dowman

Paul Dowman — Fri, 28 Aug 2009 15:16:11 +0000

Oops, thanks Dustin! I’ve fixed it.

By: Dustin

Dustin — Fri, 28 Aug 2009 11:25:35 +0000

I haven’t gotten this to work yet, but it seems step 3 should be [svn repo url] rather than [git repo url], right?

By: Shaun Mangelsdorf

Shaun Mangelsdorf — Mon, 22 Jun 2009 08:56:35 +0000

andreas:
My best guess without any more information than you’ve given here is that you have committed to your tags as though they were branches. When you do that, there is an extra changeset (or more than one) that is unique to the svn tag, so git needs to treat it as a branch.

To revert this behaviour, you can do something like this:

$ git merge-base trunk tags/Ver1.0
abcdef1234567890abcdef1234567890abcdef12
$ git tag Ver1.0 abcdef1234567890abcdef1234567890abcdef12
$ git branch -r -d tags/Ver1.0

Note though that you’ll likely lose revisions if you do this. If you want to see what revisions you’ll lose:
$ git merge-base trunk tags/Ver1.0
abcdef1234567890abcdef1234567890abcdef12
$ git log abcdef1234..trunk

Note I’ve used a shortened form of the revision hash, two periods, and then “trunk” to specify the range. (Just making it obvious that it’s to be taken literally :)

By: andreas

andreas — Thu, 18 Jun 2009 21:30:16 +0000

Step 4 isn’t working on my machine.
I’ve got the listing of the remote branches:
git branch -r
Ver2.x
tags/Ver1.0
tags/Ver1.1
tags/Ver2.0
trunk

But the git tag only tags in the remote branch. After deleting the remote branch I end up with no tags in my local clone. Am I missing somthing?

The thing is I want to totally convert to git, no step back. So I want to have all remote branches in the local master.

By: Paul Dowman

Paul Dowman — Wed, 27 May 2009 17:23:53 +0000

Thanks Matt, I’ve fixed it.

By: matt

matt — Wed, 27 May 2009 16:27:12 +0000

Thanks for this explanation. For the most part, very helpful. Only got stuck on step 3, as there are some parameters missing.

Intead of:
git svn clone –no-metadata -A authors.txt -t tags -b branches -T trunk

it would be clearer to indicate:
git svn clone [svn repository] –no-metadata -A authors.txt -t tags -b branches -T trunk [destination]

other than that, very helpful!

By: Ron Bieber

Ron Bieber — Mon, 26 Jan 2009 11:50:28 +0000

Quick and dirty shell script to convert remote tags/branches to tags per this article:

#!/bin/sh
for i in `git branch -r|grep tags\/|grep -v \\@`
do
TAGNAME=`echo $i | perl -p -e ’s/tags\///sig;’`
echo “Converting $i to $TAGNAME”;
git tag $TAGNAME $i
git branch -r -d $i >/dev/nul
done

By: Ron Evans

Ron Evans — Thu, 23 Oct 2008 21:37:39 +0000

For me, I use:

By: Martin

Martin — Sat, 13 Sep 2008 07:52:05 +0000

By: floehopper

floehopper — Sat, 26 Jul 2008 22:36:59 +0000

Thanks - that’s helpful. In case anyone else finds it useul, here’s a quick one-liner to list all the users that have committed to your svn repository…

svn log –quiet | grep ‘^r.*’ | cut -d ‘ ‘ -f 3 | sort | uniq

By: Gianni Chiappetta

Gianni Chiappetta — Sat, 26 Jul 2008 13:46:14 +0000

Thanks Paul, I’ll be referring to this article!