So, my server administrator rolled back the subversion server from a backup. My working copy is at revision 1534, but the server is now at 1525, which yields some problems:
$ svn up
svn: Revision 1534 not found
Of course, there is always the option to do a clean checkout, but is there an easier way to get my local working copy in sync with the server?
svn up -r HEAD
or specifying another specific revision should work.
You have to check out again.
Your working copy is dead.
Your admins should really try to sync their back up on each commit or storing the commits as dumps via hook script
I can't see any solution other than making a new checkout, and manually merging your uncommitted changes into your new working copy. Basically, your working copy comes from a alternate reality -- one where the server upgrade actually worked -- and I don't think Subversion has any provisions fixing this.
The same thing happened to us a few weeks ago. I renamed my trunk folder, checked out a clean trunk and then manually copied all changed files from the crash date and beyond into my trunk so that I could recommit the changes.