To get rid of the manual merge step, I could use a separate svn branch (svn://branches/VSS) as follows:
- Create a working copy of svn://branches/VSS
- Do a VSS Get Latest on this working copy
- svn commit
- svn merge from svn://trunk
- svn commit
- Do a VSS diff and checkout all files (without overwriting) with differences
- Check in those files
- reintegrate svn://branches/VSS into svn://trunk
answered 2008-09-11T19:23:32.013