You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2016/02/24 12:47:21 UTC
svn commit: r1732081 - in /subversion/trunk/subversion: include/svn_client.h
libsvn_client/conflicts.c
Author: stsp
Date: Wed Feb 24 11:47:20 2016
New Revision: 1732081
URL: http://svn.apache.org/viewvc?rev=1732081&view=rev
Log:
Remove svn_client_conflict_get_kind(). It is now unused.
* subversion/include/svn_client.h,
subversion/libsvn_client/conflicts.c
(svn_client_conflict_get_kind): 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=1732081&r1=1732080&r2=1732081&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_client.h (original)
+++ subversion/trunk/subversion/include/svn_client.h Wed Feb 24 11:47:20 2016
@@ -4594,15 +4594,6 @@ svn_client_conflict_option_describe(cons
apr_pool_t *scratch_pool);
/**
- * Return the kind of conflict (text conflict, property conflict,
- * or tree conflict) represented by @a conflict.
- *
- * New in 1.10.
- */
-svn_wc_conflict_kind_t
-svn_client_conflict_get_kind(const svn_client_conflict_t *conflict);
-
-/**
* Return the absolute path to the conflicted working copy node described
* 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=1732081&r1=1732080&r2=1732081&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/conflicts.c (original)
+++ subversion/trunk/subversion/libsvn_client/conflicts.c Wed Feb 24 11:47:20 2016
@@ -1631,12 +1631,6 @@ get_conflict_desc2_t(const svn_client_co
return NULL;
}
-svn_wc_conflict_kind_t
-svn_client_conflict_get_kind(const svn_client_conflict_t *conflict)
-{
- return get_conflict_desc2_t(conflict)->kind;
-}
-
svn_error_t *
svn_client_conflict_get_conflicted(svn_boolean_t *text_conflicted,
apr_array_header_t **props_conflicted,