After developing a feature branch for Way Too Long, we finally reached our milestone a couple of weeks ago. In the meantime a few patches had been ported back to trunk, but most work had been done in the branch. The easiest way to handle this dependency in Subversion seemed to be to simply switch trunk with the current feature branch, and so we did. It works something along the lines of:
- svn del trunk
- svn commit
- svn mv branches/Name trunk
- svn commit
A handly little recipe can be found at BigSmoke: Replacing SVN trunk with branch. Enjoy!