Using Git SVN

Notes on using git svn for Visit development

Basic workflow: Use git svn to as a private copy of the repo, and to take advantage of git's nice branching capabilities.

git clone svn+ssh://<UNAME>@portal-auth.nersc.gov/project/projectdirs/visit/svn/visit/trunk/src
cd src
git checkout -b mybranch

Develop / make changes (git add, git commit,etc)

Stay up to date with any svn changes:

git svn rebase


Batch many small changes into one coherent patch on another branch:

git checkout -b svn_mybranch
git rebase -i git-svn
>'pick' the first commit, 'squash' all others
> Revise the commit message 

You can now push this using dcommit:

git svn dcommit