how to replace ~400 files?

We have a government code which we modify to get its output in our format. It is in a directory under a larger project that is under SVN control. We received a new version of that code. Looking back, I should have probably merged our changes into that new code with SVN, but being somewhat new to SVN I did not. So now I have ~400 files from the new version that I want to copy over the ~400 files from the old version. The problem is that there are 20 files that were deleted from the old version and 20 new files. I was thinking of just copying the new files in. The files in that directory that I don't see an SVN icon I will add in svn. I then could use something like winmerge to find the files that are in the old version, but not the new version and delete in SVN. Is there a better way?

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3106673

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2015-03-19 19:40:33 CET