That sounds like the correct situation for merge, really. I sometimes fiddle with deleting specific files and updating them to specific version numbers from the past, but I don't recommend such shenanigans in a trunk.
The setup I have worked with historically is to create not only tags for backup, but at least one branch from the trunk from which to make working copies. Yeah, redundant. Errors can be introduced to the branch and dealt with in a number of ways (either by merging with the backup tag or by trashing the whole mess and creating a new branch) but the trunk remains pristine. Glows faintly, even.
Comments 3
The setup I have worked with historically is to create not only tags for backup, but at least one branch from the trunk from which to make working copies. Yeah, redundant. Errors can be introduced to the branch and dealt with in a number of ways (either by merging with the backup tag or by trashing the whole mess and creating a new branch) but the trunk remains pristine. Glows faintly, even.
Reply
Reply
Reverse the command?
$ svn copy http://svn.server.org/project/tags/20090417_trunk_backup http://svn.server.org/project/trunk
Reply
Leave a comment