Stop recommending resolution options which follow incoming moves for merges.
It makes sense for update and switch. If merging, however, the user may want
to apply an incoming edit to the node's old location, e.g. when backporting
a file edit to an older release branch where the move should not be applied.
Recommending that the move be applied without user interaction is not helpful
in such a case. Instead, the resolver should offer two options:
apply the move + edits, or apply edits at the old location.
The latter option is not yet implemented.
* subversion/libsvn_client/conflicts.c
(init_wc_move_targets): Only recommend options which follow incoming moves
for conflicts raised by update and switch operations.
git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1783879 13f79535-47bb-0310-9956-ffa450edef68
1 file changed
