At work we use svn and lately I’ve been trying git svn to maintain a local git repository that I can push to the svn server. So far, I love it! The best feature is being able to use git stash to “stash away” the current dirty workspace, work on something (say a defect), commit and then call git stash pop to return to what I was working on.
Setup is quite easy… on windows, you need to install Cygwin and under devel package select git and git-svn.
Once it’s installed, just follow the following steps to get started:
- git svn init http://path/to/svn/project/trunk projectname
- cd projectname
- git svn fetch -rREVISION (most likely this will be git svn fetch -rHEAD
- git svn rebase
That’s it… all the usual git commands will work, and when you’re ready to commit just type git svn dcommit
My only worry is that I have yet to have a conflict, and I’m afraid I’ll be hosed without my usual eclipse conflict compare.