You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by gs...@apache.org on 2010/04/11 01:41:56 UTC
svn commit: r932810 - /subversion/trunk/subversion/libsvn_wc/wc_db.h
Author: gstein
Date: Sat Apr 10 23:41:56 2010
New Revision: 932810
URL: http://svn.apache.org/viewvc?rev=932810&view=rev
Log:
The new conflict recording functions were dropped in the middle of the
"read" group of functions. Move them to their own group.
* subversion/libsvn_wc/wc_db.h:
(...): as above
Modified:
subversion/trunk/subversion/libsvn_wc/wc_db.h
Modified: subversion/trunk/subversion/libsvn_wc/wc_db.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/wc_db.h?rev=932810&r1=932809&r2=932810&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/wc_db.h (original)
+++ subversion/trunk/subversion/libsvn_wc/wc_db.h Sat Apr 10 23:41:56 2010
@@ -1394,6 +1394,44 @@ svn_wc__db_read_conflicts(const apr_arra
apr_pool_t *scratch_pool);
+/* Return the kind of the node in DB at LOCAL_ABSPATH. The WORKING tree will
+ be examined first, then the BASE tree. If the node is not present in either
+ tree and ALLOW_MISSING is TRUE, then svn_wc__db_kind_unknown is returned.
+ If the node is missing and ALLOW_MISSING is FALSE, then it will return
+ SVN_ERR_WC_PATH_NOT_FOUND.
+
+ Uses SCRATCH_POOL for temporary allocations. */
+svn_error_t *
+svn_wc__db_read_kind(svn_wc__db_kind_t *kind,
+ svn_wc__db_t *db,
+ const char *local_abspath,
+ svn_boolean_t allow_missing,
+ apr_pool_t *scratch_pool);
+
+
+/* An analog to svn_wc__entry_is_hidden(). Set *HIDDEN to TRUE if
+ LOCAL_ABSPATH in DB "is not present, and I haven't scheduled something
+ over the top of it." */
+svn_error_t *
+svn_wc__db_node_hidden(svn_boolean_t *hidden,
+ svn_wc__db_t *db,
+ const char *local_abspath,
+ apr_pool_t *scratch_pool);
+
+
+/* ### changelists. return an array, or an iterator interface? how big
+ ### are these things? are we okay with an in-memory array? examine other
+ ### changelist usage -- we may already assume the list fits in memory.
+*/
+
+
+/* @} */
+
+
+/* @defgroup svn_wc__db_record_ Conflict recording functions
+ @{
+*/
+
/* Record an update as conflicting operation on LOCAL_ABSPATH in DB.
BASE_REVISION is the revision the node was at before the update.
@@ -1614,38 +1652,6 @@ svn_wc__db_record_obstruction_conflict(s
const char *local_abspath,
apr_pool_t *scratch_pool);
-
-/* Return the kind of the node in DB at LOCAL_ABSPATH. The WORKING tree will
- be examined first, then the BASE tree. If the node is not present in either
- tree and ALLOW_MISSING is TRUE, then svn_wc__db_kind_unknown is returned.
- If the node is missing and ALLOW_MISSING is FALSE, then it will return
- SVN_ERR_WC_PATH_NOT_FOUND.
-
- Uses SCRATCH_POOL for temporary allocations. */
-svn_error_t *
-svn_wc__db_read_kind(svn_wc__db_kind_t *kind,
- svn_wc__db_t *db,
- const char *local_abspath,
- svn_boolean_t allow_missing,
- apr_pool_t *scratch_pool);
-
-
-/* An analog to svn_wc__entry_is_hidden(). Set *HIDDEN to TRUE if
- LOCAL_ABSPATH in DB "is not present, and I haven't scheduled something
- over the top of it." */
-svn_error_t *
-svn_wc__db_node_hidden(svn_boolean_t *hidden,
- svn_wc__db_t *db,
- const char *local_abspath,
- apr_pool_t *scratch_pool);
-
-
-/* ### changelists. return an array, or an iterator interface? how big
- ### are these things? are we okay with an in-memory array? examine other
- ### changelist usage -- we may already assume the list fits in memory.
-*/
-
-
/* @} */