How to copy files from one branch to another from the SVN CLI or TortoiseSVN?

Question

I try to move certain files from one branch to another or many, but when I try to copy (using tortoiseSVN), it tells me that the folder already exists: / is there a way to propagate changes from one branch to others?

Answer 1

If the file versions in both branches share a common ancestor (therefore their contents are mostly similar) and you want to propagate the changes, you probably want to merge.

This is a tricky question, and there are many ways to do this, so you probably want to read what the SVN book on the topic has to say .

, , , , , , , :

svn co http://www.example.com/svn/branches/release
cd release
svn merge -c1234 http://www.example.com/svn/trunk # merges changes made in r1234
# Build the software, run automated tests, etc.
svn ci -m "Merged revision 1234 from trunk to release branch."