Since file moves now start introducing 'update induced' conflicts on WORKING
nodes the assumption that the location can be read from BASE is no longer
valid. So start recording the full repository location in the conflict skel.

This avoid something the update_move handling calls the 'scan dance'.

* subversion/libsvn_wc/conflicts.c
  (svn_wc__conflict_skel_set_op_update,
   svn_wc__conflict_skel_set_op_switch): Store additional location.

  (setup_tree_conflict_desc): Assume the location is there, or a legacy (1.7)
    conflict.

* subversion/libsvn_wc/conflicts.h
  (svn_wc__conflict_skel_set_op_update,
   svn_wc__conflict_skel_set_op_switch): Add argument.

* subversion/libsvn_wc/update_editor.c
  (complete_conflict): Receive target location info.
  (delete_entry,
   add_directory,
   open_directory,
   close_directory,
   add_file,
   open_file): Update caller.

* subversion/libsvn_wc/upgrade.c
  (svn_wc__upgrade_conflict_skel_from_raw): Update caller.

* subversion/libsvn_wc/wc_db_update_move.c
  (check_tree_conflict,
   mark_unversioned_add_conflict,
   create_conflict_markers): Update caller.
  (get_tc_info): Remove the scan dance.

* subversion/tests/libsvn_wc/conflict-data-test.c
  (test_serialize_prop_conflict,
   test_serialize_tree_conflict): Update caller.


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