Is there any way to see the cause of the tree conflict when running svn merge -dry-run?

Question

When I do a merge in SVN, I often like to run it with the -dry-run option so that I can see my conflicts, take a look at them and develop a plan to solve them, as I am doing my actual merge. This is great for file conflicts, but with tree conflicts, I cannot find additional information about them, for example. local deletion, inbound editing during update.

Is there any way to get this information through dry run? or without actually polluting my local copy with a bunch of conflicts? I do not want to check another local copy in order to check the merge, because it takes a lot of time.

Answer 1

Chris

The svn turtle client has a test merge option. If you click on this button, a list of possible merge conflicts appears.

The button is named "Test merge".

hope this helps

Answer 2

Some simple work around without checking another local copy:

• Save your own changes locally as a patch file with svn diff > my_changes.patch

• merge

Then, if you want a rollback:

• svn revert -R . synchronizes with the repository again.

• patch < my_changes.patch will replay all your unstated changes.

Hope this helps.

Answer 3

the recommended way to view merge information is to check your changes in the branch and then merge to see the changes in your working directory. If you do not want a merger, you just come back at that moment.