[PATCH] Automatically apply recommended tree conflict resolution option

[Denis Kovalchuk]

Hello!

Starting from Subversion 1.10, the command-line client automatically resolves
tree conflicts using the recommended resolution option when it's available.
An example of such recommended resolution is the "Move and merge" action
that can be available for tree conflicts caused by renames.

The relevant links are:
https://svn.apache.org/r1783500
https://svn.apache.org/viewvc/subversion/trunk/subversion/svn/conflict-callbacks.c?view=markup#l1801

TortoiseSVN commands currently have the "old" behavior where the user has to
choose the conflict resolution option manually.

I would like to propose a patch that makes the TortoiseSVN commands
(merge, update, switch, resolve) automatically apply the recommended tree
conflict resolution when it's available. With the patch, TortoiseSVN commands
have the same behavior as the command-line client, with an improved user
experience in multiple cases, especially when an operation such as merge
causes multiple tree conflicts.

Best Regards,
Denis Kovalchuk

[Stefan]

Thanks a lot for your patch!

committed in r29412

Stefan