what you could do is this:
* Make a backup copy of your current work and folder layout (make
absolutely sure you don't forget anything).
* Delete the folder in your tree.
* "svn update" in the parent folder of the folder(s) you deleted, this
will restore everything as it is in the repo.
* Now "svn move" the old files to their new locations, you can also move
entire folders if need be until you have the same structure as in your
new work.
* copy the new files from your backup into the new folders, make sure
you don't accidentally copy ".svn" folders replacing the ones already
there, but replace any files already there.
* use "svn status" to see which files you have not yet added and "svn
add" them.
