Pushing an existing Git repository to SVN

by

I needed this as well, and with the help of Bombe’s answer + some fiddling around, I got it working. Here’s the recipe:

Import Git -> Subversion

1. cd /path/to/git/localrepo
2. svn mkdir --parents protocol:///path/to/repo/PROJECT/trunk -m "Importing git repo"
3. git svn init protocol:///path/to/repo/PROJECT -s
4. git svn fetch
5. git rebase origin/trunk
5.1.  git status
5.2.  git add (conflicted-files)
5.3.  git rebase --continue
5.4.  (repeat 5.1.)
6. git svn dcommit

After #3 you’ll get a cryptic message like this:

Using higher level of URL: protocol:///path/to/repo/PROJECT => protocol:///path/to/repo

Just ignore that.

When you run #5, you might get conflicts. Resolve these by adding files with state “unmerged” and resuming rebase. Eventually, you’ll be done; then sync back to the SVN repository, using dcommit. That’s all.

Keeping repositories in sync

You can now synchronise from SVN to Git, using the following commands:

git svn fetch
git rebase trunk

And to synchronise from Git to SVN, use:

git svn dcommit

Final note

You might want to try this out on a local copy, before applying to a live repository. You can make a copy of your Git repository to a temporary place; simply use cp -r, as all data is in the repository itself. You can then set up a file-based testing repository, using:

svnadmin create /home/name/tmp/test-repo

And check a working copy out, using:

svn co file:///home/name/tmp/test-repo svn-working-copy

That’ll allow you to play around with things before making any lasting changes.

Addendum: If you mess up git svn init

If you accidentally run git svn init with the wrong URL, and you weren’t smart enough to take a backup of your work (don’t ask …), you can’t just run the same command again. You can however undo the changes by issuing:

rm -rf .git/svn
edit .git/config

And remove the section [svn-remote "svn"] section.

You can then run git svn init anew.

More Related Contents:

  1. How do I migrate an SVN repository with history to a new Git repository?
  2. Cloning a Non-Standard Svn Repository with Git-Svn
  3. Why are git submodules incompatible with svn externals?
  4. Is git-svn dcommit after merging in git dangerous?
  5. Using Git to work with subversion: Ignoring modifications to tracked files
  6. How to import svn branches and tags into git-svn?
  7. Describe your workflow of using version control (VCS or DVCS) [closed]
  8. Why is Git better than Subversion?
  9. SVN:externals equivalent in Git?
  10. How to git-svn clone the last n revisions from a Subversion repository?
  11. How and/or why is merging in Git better than in SVN?
  12. How does Git solve the merging problem? [closed]
  13. Why is branching and merging easier in Mercurial than in Subversion?
  14. How to have ‘git log’ show filenames like ‘svn log -v’
  15. Why should I use version control? [closed]
  16. How do you deal with configuration files in source control?
  17. To put the prefix ? to codes by Git/SVN
  18. What are the relative strengths and weaknesses of Git, Mercurial, and Bazaar? [closed]
  19. Can we finally move to DVCS in Corporate Software? Is SVN still a ‘must have’ for development? [closed]
  20. Partial Commits with Subversion
  21. What makes merging in DVCS easy?
  22. Dealing with SVN keyword expansion with git-svn
  23. What makes some version control systems better at merging?
  24. Handling renames: svn vs. git vs. mercurial
  25. What is a Git commit ID?
  26. Should I add the Visual Studio 2015 .vs folder to source control?
  27. How do I export (and then import) a Subversion repository?
  28. Jenkins CI: How to trigger builds on SVN commit
  29. Is it possible to link SVN repository files so that a file is actually a reference to another repository’s file?
  30. How do you move a file?

Leave a Comment