如何撤消svn更新？

Question

I had modified files in my working directory and did an svn update. The update was performed without conflicts.

I would like to be able to revert the working directory content to the state it was just before the svn update.

The reason is because I maintain a local git repository in parallel to the shared svn repository. I forgot to git commit my local changes before doing the svn update. Now my working directory contains local changes mixed up with changes resulting from the svn update. If I commit, all changes will appear as one atomic change. I wished they would be separate. If I could revert the update and preserve the content of the working directory I had before the svn update, I could do that.

Answer 1

I keep hitting this question, and it doesn't actually include the simple answer to the "How to undo an svn update?" question.

So for the benefit of others, with the solvable case where you just wish to roll back an update:

First check the log with:

svn log | less

This will give you the revision number (eg 957 ) that you wish to go back to. Then:

svn up -r 957

Answer 2

It's not possible. The state before update is forgotten.

You can separate the changes by making subversion diff, using git apply to apply it to index, commit that (your changes) and than commit everything (the changes from pull).

That is emergency solution. I suggest you switch to git-svn , that will handle this kind of things for you in future.

Answer 3

perform an "Update to Version", so you change your local file to stable version and then re-commit. In this way you lose all local changes.

Answer 4

This is for linux users.

Suppose Revisions as follows.

Head - 20 Previous revisions to head - 18, 17, 15, 14, 10, 9,8.

go to your src directory. Use svn merge -r 17:18 $url

$url for your svn base.

Answer 5

如果在更新期间发生任何冲突，则会在您的回收站中提供您的文件和修订文件的副本