CODEWITHSUNDEEP
svn
spencewah
spencewah

Reputation: 2236

SVN accident, overwrote some key changes in my file and committed to repository. Can it be recovered?

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?

Upvotes: 1

Views: 270

Answers (5)

user237655
user237655

Reputation:

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.

Upvotes: 1

Josef Pfleger
Josef Pfleger

Reputation: 74557

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

Upvotes: 2

Mike McQuaid
Mike McQuaid

Reputation: 9814

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.

Upvotes: 2

Andreas Bonini
Andreas Bonini

Reputation: 44832

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

Sorry!

Upvotes: 0

Andrew Cox
Andrew Cox

Reputation: 10998

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.

Upvotes: 6

Related Questions