Table of Contents
Git SVN Workflow
Clone svn repository
git svn clone path_to_svn_before_trunk -T trunk -b branches -t tags
The keys specify location of trunk, branches, tags. If svn has that standard folder then
git svn clone path_to_svn_before_trunk -s
Clone only HEAD or from some revisions before head
git svn clone --stdlayout -r HEAD http://myrepo/module
$ git svn clone --prefix=svn/ -s -r534:HEAD http://some/svn/repo .
This is equivalent to
git svn init git svn fetch
Result:
git branch -a
Commit to SVN
Commit in git locally:
git commit -am 'Adding git-svn instructions to the README' git commit -am ...
Commit all changes to SVN
git svn dcommit
Result
git log -1
Pulling new changes
Pulls down any changes on the server and any work you have on top of what is on the server.
git svn rebase
Nwo commit
git svn dcommit
You can run git svn fetch to grab the new data, but git svn rebase does the fetch and then updates your local commits.
Creating Git Branches
Create branches in git and merge with master.
Creating Svn Branches
git svn branch branch_name
Continue http://git-scm.com/book/en/Git-and-Other-Systems-Git-and-Subversion#Switching-Active-Branches