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

[st...@apache.org]

Author: stsp
Date: Wed Feb 24 11:07:09 2016
New Revision: 1732074

URL: http://svn.apache.org/viewvc?rev=1732074&view=rev
Log:
Remove the svn_client_conflict_prop_get_propname() API function.
This function is now unused.

The function was a bad abstraction since svn_client_conflict_t represents
all conflicts on a node, i.e. multiple property conflicts.

* subversion/include/svn_client.h,
  subversion/libsvn_client/conflicts.c
  (svn_client_conflict_prop_get_propname): Remove.

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=1732074&r1=1732073&r2=1732074&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_client.h (original)
+++ subversion/trunk/subversion/include/svn_client.h Wed Feb 24 11:07:09 2016
@@ -4763,15 +4763,6 @@ svn_client_conflict_tree_resolve_by_id(
 svn_client_conflict_option_id_t
 svn_client_conflict_tree_get_resolution(const svn_client_conflict_t *conflict);
 
-
-/**
- * Return the name of the conflicted property represented by @a conflict.
- *
- * @since New in 1.10.
- */
-const char *
-svn_client_conflict_prop_get_propname(const svn_client_conflict_t *conflict);
-
 /**
  * Return the path to the legacy property conflicts reject file
  * for the property conflicts represented by @a conflict.

Modified: subversion/trunk/subversion/libsvn_client/conflicts.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/conflicts.c?rev=1732074&r1=1732073&r2=1732074&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Wed Feb 24 11:07:09 2016
@@ -1810,15 +1810,6 @@ svn_client_conflict_tree_get_victim_node
   return get_conflict_desc2_t(conflict)->node_kind;
 }
 
-const char *
-svn_client_conflict_prop_get_propname(const svn_client_conflict_t *conflict)
-{
-  SVN_ERR_ASSERT_NO_RETURN(svn_client_conflict_get_kind(conflict)
-      == svn_wc_conflict_kind_property);
-
-  return get_conflict_desc2_t(conflict)->property_name;
-}
-
 svn_error_t *
 svn_client_conflict_prop_get_propvals(const svn_string_t **base_propval,
                                       const svn_string_t **working_propval,