http://beardendesigns.com/blogs/permalink/11
The teaser...
Branches
Be sure to read the svn-book about branches and merging! This is just a tribute…
Extra software to make things easier, http://www.orcaware.com/svn/wiki/Svnmerge.py
This software will make sure you don’t merge revisions twice.
...