How can I delete a file from a branch and return to the trunk version?

I have an SVN branch on which there are files with patched changes. Now we have decided that some of these changes are not required.

How to effectively undo all the changes that I made to these files in a branch, and return the branch back to using the reinstallation of the chest of these specific files?

Edit: I had to add that some of the files were new in the branch, but were subsequently added to the trunk with a completely different branch, and now I want to use them. I sorted them by SVN. After removing them from the branch, then using SVN Copy copy the versions from the trunk that seem to work.

+3
source share
3

, , . , , svn copy trunk .

: " Subversion" - " " .

+1
  • , , TortoiseSVN " "
  • , .
  • " "
  • , ,

4 5 , .

, " ". , , .

TortoiseSVN, TortoiseSVN Windows.

+2

Did you try to delete the file from the branch, and then merged with the trunk? You may need to say "my conflict" (mc) if prompted.

+1
source

Source: https://habr.com/ru/post/1777650/


All Articles