SVN: Discard changes to a random version, but save changes to all of the following

Question

Situation: I have an SVN repository with a resolution of 100 versions, rev. 100 is the most recent. I made some changes to rev. 90 to cancel now. Changes in turnover. 90 are self-sufficient, so they do not affect the following changes.

Problem: I would like to return only changes to rev. 90, but still I want to have all the changes of all subsequent revisions in my head.

Question: Is there any function in SVN for returning only random version changes?

Answer 1

You need to do a reverse merge, i.e. a merge with a range of rev:rev-1 . For example, on the command line, if you are in the working directory:

 `svn merge -r 90:89 .` 

In TortoiseSVN you need to enter 90 for the version range for the merge and check the "Reverse merge" checkbox in the Merge dialog box (I don’t have it, so I can’t confirm it).

Answer 2

Use TortoiseSVN to open the log and find the version you want to return. Right-click the row and select Discard Changes From This Revision. This will result in local changes to your working copy, which will cancel this revision.