Fill in several optional components of the conflict description structure for
conflict types that didn't have these details in 1.7.

* subversion/libsvn_wc/conflicts.c
  (generate_propconflict): Add operation argument and set in description.
  (eval_text_conflict_func_result): Organize db, local_abspath as first
    non-output argument.
  (resolve_text_conflicts): Remove unused arguments. Move output arguments to
    the start. Add operation. Update caller.
  (setup_tree_conflict_desc): Remove skel argument and add specific arguments.
  (svn_wc__conflict_invoke_resolver): Add cancel handling. Collect locations
    and pass to helpers.
  (svn_wc__read_conflicts): Read locations and pass to helpers.

* subversion/libsvn_wc/conflicts.h
  (svn_wc__conflict_invoke_resolver): Add cancel support.

* subversion/libsvn_wc/merge.c
  (svn_wc_merge5): Update caller.

* subversion/libsvn_wc/props.c
  (svn_wc_merge_props3): Update caller.

* subversion/libsvn_wc/update_editor.c
  (close_directory,
   close_file): Update caller.


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