In the move-update code, make the mark_tree_conflict() function more generic
by replacing its tc_editor_baton "bag of parameters" argument with a list
of individual parameters.

This allows the mark_tree_conflict() function to be reused more easily from
contexts other than the update-move editor, e.g. svn_wc__db_bump_moved_away().

* subversion/libsvn_wc/wc_db_update_move.c
  (mark_tree_conflict): Replace baton argument with individual parameters.
   Stop marking b->conflict_root_relpath within this function and rely on
   callers that want to update the path to do so themselves.
   Rename some local variables to avoid overlap with new parameter names.
  (check_tree_conflict, tc_editor_add_directory,
   tc_editor_add_file, tc_editor_delete, bump_mark_tree_conflict,
   resolve_delete_raise_moved_away): Update callers. Some of these were
    already constructing fake tc_editor_batons in order to call the
    mark_tree_conflict() function, and there is no need to do so anymore.


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