Recover the state of a versioned file that hasn't been committed

Question

Is it possible to recover the state of a versioned file, if I accidentally updated before committing? I said everything was my conflict. I'm using OSX.

Answer 1

Updating uncommitted files will not overwrite your changes by default. Your changes are not lost unless you told Subversion to discard them (see next paragraph). If you had conflicts reported, you need to resolve them yourself, tell Subversion that you've resolved them, then commit the changes.

If, in looking at the conflicts, you responded "theirs-full", your changes are completely lost, because you told Subversion to do so.