svnmerge

I’ve just found the svnmerge tool. It’s a real boon if you have to work with branches in subversion. It’s still not quite as simple to use as svk but it’s still better than doing things by hand…