Implement a seemingly better way of notifying about a tree-conflict. Instead of using a TREE_CONFLICTED flag in svn_wc_notify_t, rather use…
Implement a seemingly better way of notifying about a tree-conflict.Instead of using a TREE_CONFLICTED flag in svn_wc_notify_t, rather usea new, separate svn_wc_notify_action_t enum value. This also removes allother letters ('A', 'D'...) from tree-conflict notifications ("by force").## TODO: This doesn't mean that the actions are actually skipped, though.* subversion/tests/cmdline/switch_tests.py (tree_conflicts_on_switch_1_2, tree_conflicts_on_switch_2_1, tree_conflicts_on_switch_2_2, tree_conflicts_on_switch_3): Fix up these tests (omitting 'D' notification on tree-conflicts).* subversion/tests/cmdline/update_tests.py (tree_conflicts_on_update_1_2, tree_conflicts_on_update_2_1, tree_conflicts_on_update_2_2, tree_conflicts_on_update_3): Fix up these tests (omitting 'D' notification on tree-conflicts).* subversion/tests/cmdline/merge_tests.py (del_differing_file, tree_conflicts_on_merge_local_ci_5_1, tree_conflicts_on_merge_local_ci_5_2, tree_conflicts_on_merge_no_local_ci_5_2): Fix up these tests (add '--- Merging rN...' output lines).* subversion/svn/notify.c (notify): Introduce a separate switch case for tree-conflicts notification. Remove all inline notification of tree-conflicts from the other notification cases. Use the new way of sending a tree-conflicts notification.* subversion/include/svn_wc.h (svn_wc_notify_action_t): Add enum value SVN_WC_NOTIFY_TREE_CONFLICT. (svn_wc_notify_t): Remove TREE_CONFLICTED flag.* subversion/libsvn_wc/util.c (svn_wc_create_notify): Do not initialize the removed field TREE_CONFLICTED. * subversion/libsvn_wc/update_editor.c (do_entry_deletion, add_directory, open_directory, close_directory, open_file, close_file): Use the new way of tree-conflict notification.* subversion/libsvn_client/repos_diff.c (delete_entry, add_directory, close_file, close_directory): Use the new way of tree-conflict notification. * subversion/libsvn_client/merge.c (IS_OPERATIVE_MERGE): Add tree-conflicted cases to this condition macro. (single_file_merge_notify, do_file_merge): Use the new way of tree-conflict notification.