Close
Glad You're Ready. Let's Get Started!

Let us know how we can contact you.

Thank you!

We'll respond shortly.

LABS
svn to git protips

When you’re moving a codebase from subversion to git, here are a few things that make the move go a bit more smoothly.

In the svn project, you can discover some things you’ll need to adjust in git after the import.

Show all files being ignored

svn propget -R svn:ignore .

Add these files to the .gitignore file at your project root, or in appropriate subdirectories. I prefer keeping it all in one place at the top level.

Show all externals

svn propget -R svn:externals .

You’ll either have to switch to using a submodule in git, or just pull the files into your project if that’s not possible for some reason.

Find all empty directories

find . -type d -empty
touch /path/to/empty/dir/.gitkeep

Since git doesn’t keep empty directories, you can add a .gitkeep file to empty directories that you don’t want to go away. Some people add a .gitignore file to keep the directory around, but that sounds totally backwards to me. You want to keep it, not ignore it.

By the way, if you are already ignoring dir/*, that will ignore the .gitkeep file as well. Make sure it isn’t missed by adding !.gitkeep to the end of your .gitignore file.

Find all authors

If you want to properly attribute commits, you’ll need to set up an authors file. But if you miss any authors, the clone will stop and complain. You can discover all the svn users that you need to put in the authors file with this command:

svn log | grep -E 'r[0-9]+ ' | cut -d  -f3 | sort | uniq

init + fetch > clone

If git svn clone doesn’t complete, try doing the init/fetch as separate operations. The clone subcommand is pretty much just doing an init followed by a fetch, but I’ve found that if the clone fails, doing the commands separately can have better success.

Comments
  1. Mike Lundy says:

    You can also do the first two with git-svn:
    `git svn show-externals`
    and
    `git svn show-ignore`

Post a Comment

Your Information (Name required. Email address will not be displayed with comment.)

* Copy This Password *

* Type Or Paste Password Here *