Thanks for this. I’ll have to play as I find the whole stop-on-copy stuff very magical.
At the moment, we just do:[geshi lang=bash]
svn merge –reintegrate https://blah/branches/branch_name
[/geshi]into a checkout of the trunk. We then resolve conflicts, test and commit.
The only downside I’m aware of is that after a reintegrate, continuing to use the branch causes all sorts of issues. If you need it still, then delete and re-create it. Fortunately, that’s not an issue with our development process as we’d use a new branch name for the next bit of work.