Allow update of move-away-edit tree-conflicts so that move sources
can be returned to single-revision status (part of issue 4232).

* subversion/libsvn_client/update.c
  (update_internal): Allow updates with tree-conflicts.

* subversion/libsvn_wc/wc.h
  (svn_wc__conflicted_for_update_p): New.

* subversion/libsvn_wc/questions.c
  (internal_conflicted_p): New, code from svn_wc__internal_conflicted_p.
  (svn_wc__internal_conflicted_p): Now just a wrapper.
  (svn_wc__conflicted_for_update_p): New.

* subversion/libsvn_wc/update_editor.c
  (already_in_a_tree_conflict, node_already_conflicted): Use new function.

* subversion/tests/libsvn_wc/op-depth-test.c
  (test_funcs): Mark move_update_subtree as PASS.

* subversion/tests/cmdline/tree_conflict_tests.py
  (actual_only_node_behaviour): Tweak update expectation.


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