ChatGPT解决这个技术问题 Extra ChatGPT

Is there a way to recover from an accidental "svn revert"?

I managed to shoot myself in the foot this morning by doing the following:

Started working on a change to my project Made a bunch of edits to a bunch of files Realized that my approach was all wrong, and that I needed to start over cd'd to the top level of my project and did a "svn --recursive revert ." to restore my local sandbox to its pre-changes state. Howled in horror as I realized that there had been a number of other changes outstanding in my local sandbox, and I had just obliterated all of them. (the svn server had been down last Friday so I hadn't been able to check them in, and I had forgot about them over the weekend)

Fortunately in this case I had done an "svn diff > temp.txt" before leaving work on Friday, and the temp.txt file was still on my hard drive, so I was able to feed that file into "patch" and recover my lost changes.

But for my future reference (i.e. the next time I make the same dumb mistake)... is there any way to tell svn to undo an "svn revert"? Does svn keep a backup of the local/not-checked-in diffs anywhere?

IIRC TortoiseSVN moves the reverted files to the recycle bin, but the original SVN command-line client does not have such nuances.
I can't find the file in the recycle bin. Am I out of luck?
Top comment regarding the recycle bin. That's just saved my day!
mine too! thank you so much. The reverted file just appeared in my recycle bin and could be restored.
You just saved my backside with this recycle bin thing!!!

s
shto

There is a solution... go to your recycle bin you'll find there the latest version of the deleted file. Tortoise "throwing" to the recycle bin every file that it revert.


Incidentally, this is also why TortoiseSVN seems so slow when doing reverts. Moving a file to the recycle bin is a very slow operation when the recycle bin is full. You can disable this feature in the "General - dialogs 1" TortoiseSVN settings.
Thanks man, you saved me! I accidentally did Revert and almost lost 2 weeks of work. Fortunately, I found it in the recycle bin.
@ArieLivshin, why would you work for 2 weeks without committing? It seems you need to learn more about branches.
Annoyingly ankhsvn doesn't do this
Thank you .. Very help ful.
P
Peter Parker

No, (absolutely) NO.

If you say to Subversion it should revert a file, all changes are gone by the wind.

Only your memory can get them back.

Exception: New files you had added, will only lose their status "added", but the file will remain in this directory, only status is unknown("?")

Platform / Software exception: Using TortoiseSVN on Windows, Revert first throws the files into Recycle Bin and then reverts them. You can dig into the Recycle Bin to recover the files.


Addendum to the above: Version control only helps you if you actually commit the files. If you are in a position that killing your working copy will kill hours of work, then you aren't committing frequently enough.
Agreed... in this case the svn server was down, and that's why I had un-committed changes still pending. :^(
Yes!!! There is a way to recover depending on your O/S and/or IDE -- read the other answers below before you have a heart attack!!
That's not true, its a little bit more complicated than a simple NO. Use a recovery tool or if your lucky the files are in the recycle bin.
@RalphMclee: It depends on platform and svn client. TortoiseSVN will save reverted new files in recycle bin. This is merely an exception. And I doubt a recovery tool may reconstruct the changes of your files in a consistent manner. It is much easier and clearer to remember: revert will destroy your work, use it carefully!
V
Vladimir

Not really Subversion specific, but if you're working with Eclipse, you can try your luck in the local history.

Now, something a little bit more Subversion specific: if you don't want to make a branch for every change you do, you can keep a couple of trunk checked out locally (trunk-modif-1, trunk-modif-2...). Each "modification" is done on a separate tree and you only need to keep a list of which check out correspond to which modification.

Or you could use Git locally but I never tried it.


FYI - get to the local history via the right click context menu "Restore from local history".
For the Eclipse part, here is a more concrete answer: stackoverflow.com/a/18220708/517705
J
JProgrammer

Recently did this mistake of not committing new file changes (about 10) onto SVN and they all vanished because of my silly mistake. But what saved me was the windows "Restore previous versions" option in the context menu. Phew that was a relief and lesson learnt.


Thank you! This saved me from redoing hours of work! I've never seen this feature of windows before, but it saved my bacon!
Where can I send the $6000 I owe you for this having thus saved days of work? Lesson learned...
I keep the checkpointing supporting such a restore turned off because it ruins performance. Recently, Eclipse deleted a folder of my projects including its git archive, due to a problem with its Undo feature, and I rather wished that I had had it turned on. However, a Windows program called Recuva saved me by searching the deleted file space. I was very careful not to add additional content to the affected drive until I had recovered all of my files, and it gave me every source file changed since my most recent backup a week earlier. Binary files were mostly not recoverable.
M
Manohar

You can't recover the files, if you are using svn command-line client.

But you can recover them, if you are using TortoiseSVN as your svn client. TortoiseSVN will automatically move them to your Recycle Bin. You can restore them from there after an accidental revert.

This is a configurable option in TortoiseSVN. It is under Settings -> Dialog 1 -> Use recycle bin when reverting.

By default it is checked, which means files are moved to recycle bin. If you want(mostly you don't care to disable this. If you have a reason, please let me also know)


Awesome!... saved me
Sadly as of 2021 this appears to no longer be the case. (while the settings option is there, the previously changed local files didn't go to the recycle bin) It would be great if there was a simple "Are you sure you want to throw away all you local changes" prompt as the menu option is right above the commit option and screwups are easy to make...
A
Aurelian Cotuna

If you are using InteliJ then you are a lucky person. On the top menu, you have a Version Control option, and under it you will find local history option, where you will find all the history for selected file, including all the operation you did with that file (update,commit, revert ).

Good luck, Arkde


And if it was a new file, the file itself will get deleted. In that case select the folder the file was in from Project view and then select 'Local History'. IntelliJ saved the day again.
s
scor4er

Also if you have reverted your .NET code (.cs files etc) and you've built your application before revert but after you've made changes, you could recover changes from assembly file using any of the reflector tools to view code.


f
fyts

I was extremely lucky to find a local change log of the file (Local Revisions) in the history browser in Eclipse. I had been inspecting the differences one by one and I had made a couple of saves on the file before overwriting.


P
Peter Barbanyaga

I reverted solution (Visual Studio + AnkhSVN ) and lose changes of few files. I can't find the file in the recycle bin.

BUT: I recovered my losing files with Handy Recovery, i.e. SVN just delete my files on reverting.

Use any data recovery software to recovery reverted files(like trial Handy Recovery)


s
shaneb

No, SVN does not keep a log or backup (although there is a solution for TortoiseSVN noted in the other answers).

But in case someone is browsing the answers and did not notice this comment in the OP's question:

"Fortunately in this case I had done an "svn diff > temp.txt" before leaving work on Friday, and the temp.txt file was still on my hard drive, so I was able to feed that file into "patch" and recover my lost changes."

I imagine it is a common paradigm to do 'svn diff' BEFORE you do an 'svn revert'. If you get in the habit of doing this, even if the diff is just echoed to the terminal, you've at least got one possible avenue to recover your lost changes.


关注公众号,不定期副业成功案例分享
Follow WeChat

Success story sharing

Want to stay one step ahead of the latest teleworks?

Subscribe Now