I've never had to go back to a previous revision in SVN until today. I was at version 60, made some changes, and committed them so now I'm at 61. I realized I was wrong to commit those changes, so I reverted back to version 60. I've made my changes again, but now I can't commit because tortoise is telling me my files are out of date. I don't want to do an update to get the latest version, because then I'll get wrong code merged with the right code. Anyone know how to resolve this situation?

Here's how