Nick, I had similar issues, and I solved them by following a recipe from this article (written by a GitHub developer): http://www.jonmaddox.com/2008/03/05/cleanly-migrate-your-subversion-repository-to-a-git-repository/ I still believe Subversion is a very good VCS.