GitSvnBranches
From Sit
This is the process needed to keep git and SVN in sync during the period of testing.
Steps
(Assuming you have a branch of the sitracker repo on github by this point)
-
$ git svn init -t tags -b branches -T trunk http://sitracker.svn.sourceforge.net/svnroot/sitracker- add upstream svn as a remote branch -
$ git svn fetch- fetch the svn repos -
$ git checkout -b svn-trunk trunk- create and switch a local branch from your remote branch called 'svn-trunk' (this can be named anything) - (Optional)
$ git checkout -b svn-3.x 3.x- create a branch for 3.x code -
$ git svn rebase- this will update your git copy with any changes from svn -
$ git svn dcommit- this will update the svn repo with any local changes you will make