You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2010/08/04 17:37:45 UTC
svn commit: r982307 - in /subversion/trunk/subversion/libsvn_wc: wc_db.c
wc_db.h
Author: rhuijben
Date: Wed Aug 4 15:37:45 2010
New Revision: 982307
URL: http://svn.apache.org/viewvc?rev=982307&view=rev
Log:
Mark two wc__db apis as only being used for a very specific purpose.
* subversion/libsvn_wc/wc_db.c
(svn_wc__db_temp_base_set_props,
svn_wc__db_temp_working_set_props): Undefine for !SVN__SUPPORT_BASE_MERGE
* subversion/libsvn_wc/wc_db.h
(svn_wc__db_temp_base_set_props,
svn_wc__db_temp_working_set_props): Undefine for !SVN__SUPPORT_BASE_MERGE
Modified:
subversion/trunk/subversion/libsvn_wc/wc_db.c
subversion/trunk/subversion/libsvn_wc/wc_db.h
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.c?rev=982307&r1=982306&r2=982307&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.c (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.c Wed Aug 4 15:37:45 2010
@@ -3806,6 +3806,7 @@ set_properties(svn_wc__db_t *db,
return SVN_NO_ERROR;
}
+#ifdef SVN__SUPPORT_BASE_MERGE
svn_error_t *
svn_wc__db_temp_base_set_props(svn_wc__db_t *db,
@@ -3842,6 +3843,7 @@ svn_wc__db_temp_working_set_props(svn_wc
scratch_pool));
}
+#endif /* SVN__SUPPORT_BASE_MERGE */
svn_error_t *
svn_wc__db_op_delete(svn_wc__db_t *db,
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.h?rev=982307&r1=982306&r2=982307&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.h (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.h Wed Aug 4 15:37:45 2010
@@ -1211,6 +1211,8 @@ svn_wc__db_op_set_props(svn_wc__db_t *db
const svn_skel_t *work_items,
apr_pool_t *scratch_pool);
+/* See props.h */
+#ifdef SVN__SUPPORT_BASE_MERGE
/* ### Set the properties of the node LOCAL_ABSPATH in the BASE tree to PROPS.
###
### This function should not exist because properties should be stored
@@ -1243,7 +1245,7 @@ svn_wc__db_temp_working_set_props(svn_wc
const char *local_abspath,
const apr_hash_t *props,
apr_pool_t *scratch_pool);
-
+#endif
/* ### KFF: This handles files, dirs, symlinks, anything else? */
/* ### dlr: Does this support recursive dir deletes (e.g. _revert)? Document. */