For codeyard I’m developing cyv, which is a (still quite specific) util (written in Python!) to keep svn and git repo’s in sync. On the serverside, at least. First, let me explain what exactly is synced.
When someone commits to a svn repo, the git repo is synced with
git-svn. You can just clone the git repo and
git pull instead of having to use
When pushing commits to the git repo on a branch that came from the svn repo, the commits are
git-svn dcommit-ed. If it fails (svn doesn’t do merges that well), it’ll revert the updates and will receive the successful part of the dcommit on the next post-commit triggered fetch from the svn repo. The user will have to
git-pull and fix the commits locally: the git manner.
If pushes don’t involve the svn backed branches, it won’t have any unusual side-effects. This allows for pushing and pulling of topic-branches separate from svn and pushing them, when mature enough, into subversion without ever having to hassle (as much) with
An obvious huge advantage is that a
git-clone of the git repo is a hell of a lot faster than a
git svn clone. A second big advantage is that someone can choose to either use git or svn himself while not mutually excluding the other. This is of special concern to codeyard, where projects should be accessible to everyone: beginners and advanced. If instead we offered fully separated git repositories, the projects that prefer git would become inaccessible for most. And if we wouldn’t offer git repos, people would set them up themselves elsewhere, for they really don’t want to bother themselves with
cyv contains some neat features. One I want to highlight is the
cyv-layout file, you can place in the root of the svn repo. It tells
cyv how the repository is laid out. Eg:
Another one is a wrapper around
git-shell to have per repository permissions for different users depending on their ssh pub key.
cyv is still quite specific to the needs of codeyard. (If you’re a codeyard participant: be patient, it’ll be up mid june). However, if you’re interested, I’ll be glad to hear from you.