Fix issue 4347, resolve assert after update with tree-conflict.

* subversion/libsvn_wc/wc.h
  (svn_wc__conflicted_for_update_p): Add parameter to return whether ignored.

* subversion/libsvn_wc/questions.c
  (internal_conflicted_p): Change parameter to return whether ignored.
  (svn_wc__internal_conflicted_p): Adjust call.
  (svn_wc__conflicted_for_update_p): Add parameter to return whether ignored.

* subversion/libsvn_wc/update_editor.c
  (already_in_a_tree_conflict, node_already_conflicted): Add parameter
   to return whether ignored.
  (open_root, add_directory, open_directory, add_file, open_file): Set
   shadowed when ignoring a conflict.
  (delete_entry): Adjust call.

* subversion/tests/libsvn_wc/op-depth-test.c
  (update_with_tree_conflict): Extend to test second case.
  (test_funcs): Mark update_with_tree_conflict PASS.


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