svn commit: r1731845 - in /subversion/trunk/subversion: include/svn_client.h libsvn_client/conflicts.c

[st...@apache.org]

Author: stsp
Date: Tue Feb 23 12:16:27 2016
New Revision: 1731845

URL: http://svn.apache.org/viewvc?rev=1731845&view=rev
Log:
Remove the temporary svn_client_conflict_option_id_to_wc_conflict_choice()
public API function.

* subversion/include/svn_client.h
  (svn_client_conflict_option_id_to_wc_conflict_choice): Remove.

* subversion/libsvn_client/conflicts.c
  (svn_client_conflict_option_id_to_wc_conflict_choice): Rename to ...
  (conflict_option_id_to_wc_conflict_choice): ... this, and mark 'static'.
  (resolve_text_conflict, resolve_prop_conflict): Update callers.

Modified:
    subversion/trunk/subversion/include/svn_client.h
    subversion/trunk/subversion/libsvn_client/conflicts.c

Modified: subversion/trunk/subversion/include/svn_client.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_client.h?rev=1731845&r1=1731844&r2=1731845&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_client.h (original)
+++ subversion/trunk/subversion/include/svn_client.h Tue Feb 23 12:16:27 2016
@@ -4409,17 +4409,6 @@ typedef enum svn_client_conflict_option_
 } svn_client_conflict_option_id_t;
 
 /**
- * Map an option ID to a legacy conflict choice.
- * This is a temporary API. It is currently still needed to mark
- * conflicts as resolved using libsvn_wc interfaces.
- *
- * @since New in 1.10.
- */
-svn_wc_conflict_choice_t
-svn_client_conflict_option_id_to_wc_conflict_choice(
-  svn_client_conflict_option_id_t option_id);
-
-/**
  * Set a merged property value on @a option to @a merged_propval.
  * 
  * Setting the merged value is required before resolving the property

Modified: subversion/trunk/subversion/libsvn_client/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/conflicts.c?rev=1731845&r1=1731844&r2=1731845&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Tue Feb 23 12:16:27 2016
@@ -108,8 +108,8 @@ struct svn_client_conflict_option_t
  * Return svn_wc_conflict_choose_undefined if no corresponding
  * legacy conflict choice exists.
  */
-svn_wc_conflict_choice_t
-svn_client_conflict_option_id_to_wc_conflict_choice(
+static svn_wc_conflict_choice_t
+conflict_option_id_to_wc_conflict_choice(
   svn_client_conflict_option_id_t option_id)
 {
 
@@ -597,8 +597,7 @@ resolve_text_conflict(svn_client_conflic
   svn_error_t *err;
 
   option_id = svn_client_conflict_option_get_id(option);
-  conflict_choice =
-    svn_client_conflict_option_id_to_wc_conflict_choice(option_id);
+  conflict_choice = conflict_option_id_to_wc_conflict_choice(option_id);
   local_abspath = svn_client_conflict_get_local_abspath(conflict);
 
   SVN_ERR(svn_wc__acquire_write_lock_for_resolve(&lock_abspath, ctx->wc_ctx,
@@ -638,8 +637,7 @@ resolve_prop_conflict(svn_client_conflic
   svn_error_t *err;
 
   option_id = svn_client_conflict_option_get_id(option);
-  conflict_choice =
-    svn_client_conflict_option_id_to_wc_conflict_choice(option_id);
+  conflict_choice = conflict_option_id_to_wc_conflict_choice(option_id);
   local_abspath = svn_client_conflict_get_local_abspath(conflict);
 
   SVN_ERR(svn_wc__acquire_write_lock_for_resolve(&lock_abspath, ctx->wc_ctx,