When the command line client shows tree conflict information, be more explicit about the fact that an incoming deletion might be part of an…
When the command line client shows tree conflict information, be moreexplicit about the fact that an incoming deletion might be part of anincoming move, and that a missing target during a merge might havebeen deleted or moved in the merge target's history. The currentwording is a common source of user confusion. I'm not really sureif this change helps users a lot but we'll see.If we ever grow support for incoming moves, we'll need to updatethese descriptions again anyway.* subversion/svn/cl-conflicts.c (local_reason_str): Add 'operation' parameter, and print print additional hints about possible causes if the operation is a merge. (incoming_action_str): Any incoming delete might be part of an incoming move, so say "incoming delete or move".* subversion/tests/cmdline/stat_tests.py (status_with_tree_conflicts): Adjust expected output.* 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): Adjust expected output.* 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): Adjust expected output.