tags:

views:

131

answers:

5

So sheepishly I ask if this is possible...

In trying to resolve a conflicted file, I overwrote all my changes with the most recent version from the repository and then committed. Now I'm realizing I wanted to save a lot of that. Does my local svn keep track of the changes? Are they at all recoverable?

Thanks... -S

+7  A: 

svn only keeps the changes that you commit, if you never committed the changes then they will of been lost.

How did you resolve the conflict? There is a small chance that the files that svn creates when it detects a conflict, something like <filename>.r<revision_number> will still be there if you resolved the conflict manually.

Andrew Cox
This is the best shot, but it probably won't work because "svn resolved" cleans up all those files (as does "svn revert").
Rafe
Undelete? * required - at least 15 characters
Robert Fraser
Robert - I am not sure what you mean?
Andrew Cox
Whenever a file is deleted, it remains on the disk until it is overwritten. There's a small chance that it can be recovered, especially if it was deleted very recently and is a small (i.e. one block) file. Try this app: http://www.piriform.com/recuva
Robert Fraser
A: 

No, the only recoverable data is the one you (or someone else) previously commited.

Sorry!

Andreas Bonini
+2  A: 

Unless the stuff you wanted was already in the repository I'm afraid you're out of luck. It's gone.

This is a reason to ALWAYS check svn diff before you run svn commit.

Mike McQuaid
Checking svn diff output before committing would not have made any difference. The local changes were already lost when he chose the repository version and marked the conflict as resolved. Committing comes after that.
Wim Coenen
+2  A: 

No svn clients I know keep a local history, but some IDEs (e.g. Eclipse do).

Josef
+1  A: 

I just had the same problem and came across this via Google. Luckily, a few minutes after that sinking feeling, I checked my Windows recycle bin and had the file with a .mine suffix in there. I restored that file and got back several days worth of work.

BC
This might work!
yu_sha