Checkout
stsp
committed
on 03 Jun 15
Start introducing some actual svn_client_conflict API functions.

The API functions introduced with this commit are very trivial ones.

* su… Show more
Start introducing some actual svn_client_conflict API functions.

The API functions introduced with this commit are very trivial ones.

* subversion/include/svn_client.h

 (svn_client_conflict_get_local_abspath,

  svn_client_conflict_get_operation,

  svn_client_conflict_get_incoming_change,

  svn_client_conflict_get_local_change): Declare. These function replace the

  macros called svn_client_conflict_get_local_abspath,

  svn_client_conflict_get_operation, svn_client_conflict_get_action, and

  svn_client_conflict_get_reason.

* subversion/libsvn_client/resolved.c

 (svn_client_conflict_get_local_abspath,

  svn_client_conflict_get_operation,

  svn_client_conflict_get_incoming_change,

  svn_client_conflict_get_local_change): Implement.

* subversion/svn/cl-conflicts.c

 (svn_cl__get_human_readable_prop_conflict_description,

 (svn_cl__get_human_readable_tree_conflict_description,

  append_tree_conflict_info_xml): Switch to new functions replacing macros.

* subversion/svn/conflict-callbacks.c

 (handle_tree_conflict, conflict_func_interactive): Likewise.

Show less