Version 2 (modified by sayler, 10 years ago)

--

If you'd like to track the main SVN trunk without creating your own SVN branch and you find SVK to be ... suboptimal you can use git as well.

This *should* be as simple as doing git svn clone https://geni-orca.renci.org/svn/orca $ORCA_HOME but this has a couple of drawbacks

  1. git (and thus git-svn) won't pull empty svn directories by default. We rely on empty directories for builds to work.
  2. git-svn, by default, mirrors the whole SVN repository locally. This is nice in that you can access the whole changelog for the project from git. This is not nice in that the repository is kind of huge because of the Xen images that were added/removed in the early history.
  3. git-svn doesn't respect svn's ignore files/tags

Fortunately, someone has written a nice little script called git-me-up that pretty much solves all these problems.

 mkdir git-me-up
 cd git-me-up  
 git clone git://github.com/gma/git-me-up.git
 make install  # -> /usr/local/bin  
 git-me-up https://geni-orca.renci.org/svn/orca $ORCAHOME

From then on, you can use git-svn as you would normally:

 git svn fetch # pull upstream changes
 git svn commit # to the LOCAL repository
 git svn dcommit # should you ever decide to push back to mainline