CODEWITHSUNDEEP
svntortoisesvn
Peter
Peter

Reputation: 111

tortoisesvn bringing back removed revision code

Suppose I have trunk with revisions from 1 to 20. I remove code from revisions 15 to 20 from trunk using reversed merge. Now, in trunk, I have code until revision 14.

If I need to bring back revision 18 to trunk, how do I do that?

Upvotes: 0

Views: 53

Answers (1)

Ben
Ben

Reputation: 8905

While you may be able to get a merge working in some way or another, the sure-fire way is to create a patch from the revision you want to restore, and apply that patch to the HEAD of your repository.

  1. In the "Show Log" dialog, right-click the revision you want to restore.
  2. Choose "Show changes as unified diff" from the menu.
  3. Save the resulting diff to a patch file at your working copy root.
  4. Right-click on the patch file and choose TortoiseSVN→"Apply patch..."
  5. Patch and save all files
  6. Commit the changes

Upvotes: 3

Related Questions