Author: stsp
Revision: 1846851
Modified property: svn:log
Modified: svn:log at Sun Nov 18 19:38:34 2018
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Sun Nov 18 19:38:34 2018
@@ -28,8 +28,10 @@ Proper tests will follow as soon.
is similar enough to make sharing code written for other cases possible.
(resolve_both_moved_file_text_merge): New resolution handler for the
svn_client_conflict_option_both_moved_file_merge option.
- (configure_option_incoming_delete_ignore,
- configure_option_incoming_delete_accept): Don't match move-vs-move cases.
+ (configure_option_incoming_delete_ignore): Don't match move-vs-move cases.
+ This causes the 'ignore deletion' option to show up in actual delete vs.
+ delete conflict cases as a side-effect.
+ (configure_option_incoming_delete_accept): Don't match move-vs-move cases.
(describe_incoming_move_merge_conflict_option): Change 'details' parameter
to a move target path, so this function can also be used for the new
svn_client_conflict_option_both_moved_file_move_merge option.
