I have two branches : X and Y. I want to replace a Y’s subdirectory (y1) by its equivalent from X (x1).
For the time being, I do the following : copy x1 to Y, remove y1, rename (move) x1 to y1 :
a) svn copy https://path/to/branches/X/x1 https://path/to/branches/Y/ b) svn delete https://path/to/branches/Y/y1 c) svn move https://path/to/branches/Y/x1 https://path/to/branches/Y/y1
I think it is quite ugly…
How could I do it in a smarter way ?
If you really want to replace the directory, you can do that with two operations:
If Y/y1 is really already an older copy of X/y1, you shouldn’t replace it all the time, but instead merge all changes since the last merge into it.