No, I'm saying your tree is gone forever. The files that did not have conflicts have already been merged, but the files that do have conflicts are in their old state. You can't always go back to the "before svn update" state.