Allow move-update to handle replaced nodes.  This change adds a path
to the moved-away conflict stored in ACTUAL_NODE and paves the way
for handling multiple moved-to at one local_relpath.

* subversion/libsvn_wc/conflicts.h
* subversion/libsvn_wc/conflicts.c
  (svn_wc__conflict_skel_add_tree_conflict): Add path parameter.
  (svn_wc__conflict_read_tree_conflict): Add path parameter.

* subversion/include/private/svn_wc_private.h
* subversion/libsvn_wc/tree_conflicts.c
  (svn_wc__add_tree_conflict): Add path parameter.

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

* subversion/libsvn_wc/wc_db_private.h
  (svn_wc__db_op_depth_moved_to): New.

* subversion/libsvn_wc/wc_db.c
  (svn_wc__db_op_depth_moved_to, svn_wc__db_base_moved_to): New.

* subversion/libsvn_wc/update_editor.c
  (check_tree_conflict): Raise a moved-away conflict for replaces that
   overlay a move, store the new path in the conflict.
  (delete_entry, add_directory, open_directory, add_file, open_file,
   change_file_prop): Pass NULL.

* subversion/libsvn_wc/wc_db_update_move.c
  (mark_tree_conflict, get_tc_info): Add path parameter.
  (check_tree_conflict): Use new functions.
  (tc_editor_add_directory, tc_editor_add_file, tc_editor_delete): Pass NULL.
  (update_moved_away_conflict_victim): Add path parameter, use new function.

* subversion/libsvn_wc/wc-queries.sql
  (STMT_SELECT_LOWEST_WORKING_NODE): Select moved-to.

* subversion/libsvn_wc/upgrade.c
  (svn_wc__upgrade_conflict_skel_from_raw): Pass NULL.

* subversion/libsvn_client/merge.c
  (tree_conflict): Add path parameter.
  (tree_conflict_on_add): Adjust call.
  (check_moved_away): Replace boolean parameter with path.
  (merge_file_changed, merge_file_deleted, merge_dir_opened,
   merge_dir_props_changed, merge_dir_deleted): Use path instead of boolean.

* tools/dev/svnraisetreeconflict/svnraisetreeconflict.c
  (raise_tree_conflict): Pass NULL.

* subversion/tests/libsvn_wc/conflict-data-test.c
  (test_read_write_tree_conflicts): Pass NULL.
  (test_serialize_tree_conflict): Pass and retrieve new path.

* subversion/tests/libsvn_wc/op-depth-test.c
  (layered_moved_to): New XFail test.
  (test_funcs): Mark move_replace as PASS, add new test.


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