With the release of SVN 1.5, they've integrated 'svnmerge' into the
svn binary as 'svn merge'. This means that when we upgrade we need to
make sure we migrate the repos on gerolde AND make devtools changes.
I'm looking for someone interested in figuring out some of these
changes - the devtools stuff shouldn't be hard, but the migration is a
tad worrying, because I don't want to bork our repos (they will be
backed up beforehand).