Checkout
stsp
committed
on 25 Jun 15
Replace macros svn_client_conflict_get_src_left_version() and
svn_client_conflict_get_src_right_version() with a new set of
functions return… Show more
Replace macros svn_client_conflict_get_src_left_version() and

svn_client_conflict_get_src_right_version() with a new set of

functions returning the same information. Replace some use of

the svn_wc_conflict_version_t structure with a few individual

parameters and variables.

* subversion/include/svn_client.h

 (svn_client_conflict_get_repos_info,

  svn_client_conflict_get_incoming_old_repos_location,

  svn_client_conflict_get_incoming_new_repos_location): Declare.

 (svn_client_conflict_get_src_left_version,

  svn_client_conflict_get_src_right_version): Delete.

  

* subversion/libsvn_client/resolved.c

 (svn_client_conflict_get_repos_info,

  svn_client_conflict_get_incoming_old_repos_location,

  svn_client_conflict_get_incoming_new_repos_location): Implement.

* subversion/svn/cl-conflicts.c

 (svn_cl__get_human_readable_tree_conflict_description,

  add_conflict_version_xml, append_tree_conflict_info_xml): Update callers.

* subversion/svn/cl.h

 (svn_cl__node_description): Expect several input parameters instead of

  a single svn_wc_conflict_version_t struct. Otherwise, callers would now

  have to create a temporary struct containing the same information.

* subversion/svn/conflict-callbacks.c

 (handle_tree_conflict): Update caller.

* subversion/svn/info-cmd.c

 (print_info): Update caller.

* subversion/svn/util.c

 (svn_cl__node_description): Use several input parameters instead of struct.

Show less