Fix misreporting of tree conflict victim's node kind, in particular
in cases where the victim is an obstruction.

* subversion/libsvn_wc/conflicts.c
  (read_tree_conflict_desc): The local node kind cannot be derived from the
   incoming src-left or src-right node kind as was done here. For example,
   local unversioned files were labeled as 'local dir' if they obstructed
   an incoming directory addition. If the conflict reason is an obstruction
   we must check the on-disk state of the node and use it to describe the
   victim's node kind. Missing nodes obviously have node type 'none' but
   they were described as 'file'.

* subversion/svn/cl-conflicts.c
  (local_reason_str, incoming_action_str): Describe symlinks as files.
   Handle 'none' and 'unknown' type nodes.

* subversion/tests/cmdline/switch_tests.py
  (forced_switch_failures): This test had node kinds swapped around. Fix it.

* subversion/tests/cmdline/tree_conflict_tests.py
  (actual_only_node_behaviour): Output for 'none' type nodes has changed.
   Adjust expected output accordingly.


git-svn-id: https://svn.apache.org/repos/asf/subversion/trunk@1619418 13f79535-47bb-0310-9956-ffa450edef68