Fix some of issue 4303, move-update for moves in deletes.

* subversion/libsvn_wc/conflicts.c
  (resolve_conflict_on_node): Raise conflicts on moves in deletes.

* subversion/libsvn_wc/wc-queries.sql
  (STMT_SELECT_OP_DEPTH_MOVED_PAIR): New.

* subversion/libsvn_wc/wc_db.h
  (svn_wc__db_resolve_delete_raise_moved_away): New.

* subversion/libsvn_wc/wc_db_update_move.c
  (mark_tree_conflict): Add repos relpath parameter, use it to construct
   conflict repos relpaths.
  (check_tree_conflict): Add kind and relpath parameters.
  (tc_editor_add_directory, tc_editor_add_file,
   tc_editor_delete): Get kind and relpath.
  (tc_editor_alter_directory, tc_editor_alter_file): Get kind and relpath
   before checking for conflict.
  (resolve_delete_raise_moved_away,
   svn_wc__db_resolve_delete_raise_moved_away): New.

* subversion/tests/libsvn_wc/op-depth-test.c 
  (move_in_delete): Resolve delete-edit then move-edit.
  (layered_moved_to): Resolve delete-edit (still XFAIL).
  (test_funcs): Mark move_in_delete PASS.


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