We have experienced the same problem. Our solution was (to our great satisfaction) not to use fetch on SVN but to let git
import all SVN tags, branches and trunk to git
-like structure.
Our SVN repository wasn't even properly created (trunk/tags/branch directories), but it didn't matter.
git svn --tags PATH_TO_YOUR_TAGS --branches PATH_TO_YOUR_BRANCHES --trunk PATH_TO_YOUR_TRUNK svn+ssh://path.to.your.svn/repository
This will take really long time. After this, workflow is git
-like. You commit and make branches like in git
, then...
commit to SVN:
git svn dcommit
checkout from SVN: (in diff)
git svn rebase