Merging an svn working copy into a git working copy and vise versa?

Question

Circumstances require that I version my own work on a git repo while the "trunk" for the project is on an svn repo, meaning I will regularly need to update my svn working copy and merge its revisions into my git working copy, and vise versa. Is there any easy way to do this in svn and git? I am currently using SmartGit and TortiseSVN as clients.

Answer 1

Yes, use git svn. Check the man page for more details, but the basic idea is that you clone the svn repo with git svn clone, and then keep everything up to date with git svn rebase and git svn dcommit.

Answer 2

Clone the repository with SmartGit/Hg. Depending on the URL, it will recognize immediately that it's an SVN repository or it will ask you. In this case, select SVN. The resulting clone is similar to what you will get when using git-svn, however SmartGit's functionality is significantly more powerful:

http://www.syntevo.com/smartgithg/svn-tour.html

http://www.syntevo.com/smartgithg/documentation.html?page=concepts-svn