We are using a tool which generates source code. This source code is submitted into the trunk. New generate sessions are copied over the existing files. Problem is that when someone wishes to merge the trunk into a branch, you get conflicts (local add, incoming add upon merge).
What I want is: takes all the files from the trunk and copy them to my branch. Delete all files that are not in the trunk.
I can’t find or think of an SVN and user friendly solution, so I’m hoping some of you will 😀
For this very reason, you shouldn’t keep generated files in Subversion (or any source code control system).
However, you are where you are. You need to
svn delthe files you want to go away andsvn cpthe files you want in their place. You can use URLs to the repository to avoid checking everything out and you can usesvn lson a directory URL to list files to find out what you need to delete.