Reviewboard git mirror

For some months now, I've been maintaining a git mirror of the Reviewboard project's svn repository. The git-svn tool works really well for this, except for one small wrinkle: the reviewboard projects uses svn:external to include an external module, djblets, and git-svn provides no transparent way to support this.

For now, I manage this manually. When ever I notice an update to djblets (which are thankfully rather rare), I use the following process to merge the changes into a branch (with-djblets) in the git repo:

$ cd ~/src/djblets
$ git svn rebase
$ git log -1 | grep -v '^commit' > /tmp/djblets.log

Note: change "1" to whatever number of commits have happened in djblets since the last time I did this. The grep command removes the git-specific "commit" lines from the log, which won't be interesting enough to include in the commit message below.

$ cd ~/src/reviewboard-with-djblets
$ git status # make sure working dir is clean
$ cp -rp ~/src/djblets/* reviewboards/djblets/

At this point, I do a git status and manual sanity check to make sure the changes I'm about to commit here match the incoming change to djblets.

$ git add <files that are changed/new>
$ git commit -F /tmp/djblets.log
$ git push public-repo with-djblets

Done! Simple, no? Well, no... This process has a number of problems, the main one of which is it's manual, and I have to do it. I'm hoping that I'll be able to bend git-submodule to my will enough to take care of this.

Comments

comments powered by Disqus