Folder Restructure and Merge Conflict in SVN

Question

One of our project folders get conflicted during SVN merge after a folder restructure. I am not sure if there is a way to resolve the conflict during the merge. The conflict also causes it not to find the differences between the files from the old folder structure. Below is a simplistic scenario of the situation.

• /folder/path1/file.txt @rev1 //Here we have the original file at the original path
• /folder/path2/file.txt @rev2 //The file get updated with new content and then moved to a new to folder path. This is where the conflict happens. During SVN merge, SVN tend to see the file.txt in the new path as a new object

Is this what SVN move is intended to solve? Or has this been the weak point of SVN when it comes to merging and folder restructure?

Answer 1

This is one of the weak point of SVN. We had to use SVN Move for future references so that when SVN does the branch it will know which file to track.