Handle delete conflicts during move-update by raising tree-conflicts
and converting modified trees to copies.

* subversion/libsvn_wc/wc_db_update_move.c
  (tc_editor_delete): Handle delete conflicts.
  (get_info): Return correct enum type.

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

* subversion/libsvn_wc/update_editor.c
  (node_has_local_mods): Renamed to ...
  (svn_wc__node_has_local_mods): ... this, made non-static.
  (check_tree_conflict): Adjust call.

* subversion/libsvn_wc/wc-queries.sql
  (STMT_DELETE_WORKING_OP_DEPTH_ABOVE, STMT_UPDATE_OP_DEPTH_RECURSIVE): New.

* subversion/tests/libsvn_wc/op-depth-test.c
  (move_update_delete_mods): New test.
  (test_funcs): Add new test.

* subversion/tests/cmdline/update_tests.py
  (update_moved_dir_leaf_del, update_moved_dir_file_add): Do non-recursive
   resolves, expect delete-delete conflicts.


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