svn - How do I undo a tortoisesvn update

Question

I am trying to retrieve my working copy of a file before updating to a new revision. The problem is somehow tortoise messed things up and now a days work worth of code is uncompilable.

I tried updating to the previous revision, yet I got so many conflicts that I cannot fix since SVn literally merged all the text together.

Does Tortoise SVN versions a file locally before doing an update, and where can I find the file. I tried looking under .svn\prestine but I could only find an old version of my code.

Can someone please help.

Answer 1

There is unfortunately no way to do it. You are out of luck.

The way I solved it is using git as subversion client. Git is significantly different from subversion and the subversion interaction adds some restrictions of it's own, but it gives you better protection from loosing work to merge conflicts.

Plus it has support for committing individual changes separately and keeping a local stack of changes, which I often use if I find a bug during some larger task and want to push it out to trunk while the main work is still in progress or if I want to separate the work to logical pieces that are easier to check.