Restoring a subversion repository to workcopy revision

Question

My subversion VM died the other day (host hardware melted) and I had to restore a backed up copy of the vmware server image. The restore went well and the VM is running again on a new host.

The problem I have is that my restored repository is at revision 60 but my working copy on my PC is at 66. When I try and commit my working copy I get the following error message.

svn: Commit failed (details follow):
svn: No such revision 61

What is the best way to force this commit and bring subversion up to the same revision as my working copy?

Thanks

Answer 1

I don't think your old working copy can "teach" the new SVN server about the missing revisions (61-66).

I would suggest:

1. Check out new working copy
2. SVN EXPORT your old working copy onto the new working copy, thereby updating the files with your changes
3. SVN COMMIT the changes

At this point the new SVN server will be up-to-date.

Answer 2

Do a fresh checkout from the restored repository. Copy the changes from your existing working copy over to the new checkout and then commit.

You do not want to copy the .svn directories. A tool like rsync can help sync to two directories.

rsync --del --exclude=".svn"

If there are lots of differences such as new files and deleted files svn_load_dirs.pl may be able to help.