Svn: update the file in the branch before the preliminary revision

Question

I have the following script:

I made a branch branch in edition 100. I made some changes, and now the repository is up to version 110. Now I want the old version of some files (from r90) to be launched in my branch. I can decide to change these files, and in this case I want to commit the changes to my branch.

How to do it? If I just upgrade the files in my branch to version 90, svn deletes them because my branch did not exist at this point. Can I somehow merge the old revision of the trunk into the current branch?

Answer 1

I assume that you deleted the file between 90 and 100.

Revert the revision when you deleted the file (which I assume is between 90 and 100). Usually in most svn gui these days you may not see them unless you remove the "stop on copy / rename" in the svn turtle, for example. If you do this from the command line, this should not hurt you.

The command should be something like a reverse merge of X (no matter which revision deletes a file from svn, between 90 and 100) into the current revision.