You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ju...@apache.org on 2015/11/10 11:35:34 UTC
svn commit: r1713607 - in /subversion/branches/move-tracking-2/subversion:
include/private/svn_branch.h libsvn_delta/branch.c
Author: julianfoad
Date: Tue Nov 10 10:35:34 2015
New Revision: 1713607
URL: http://svn.apache.org/viewvc?rev=1713607&view=rev
Log:
On the 'move-tracking-2' branch: Make a public function private.
* subversion/include/private/svn_branch.h,
subversion/libsvn_delta/branch.c
(svn_branch_map_add_subtree): Make private.
Modified:
subversion/branches/move-tracking-2/subversion/include/private/svn_branch.h
subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c
Modified: subversion/branches/move-tracking-2/subversion/include/private/svn_branch.h
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/include/private/svn_branch.h?rev=1713607&r1=1713606&r2=1713607&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/include/private/svn_branch.h (original)
+++ subversion/branches/move-tracking-2/subversion/include/private/svn_branch.h Tue Nov 10 10:35:34 2015
@@ -589,25 +589,6 @@ svn_error_t *
svn_branch_state_purge(svn_branch_state_t *branch,
apr_pool_t *scratch_pool);
-/* Create a copy of NEW_SUBTREE in TO_BRANCH.
- *
- * For each non-root element in NEW_SUBTREE, create a new element with
- * a new EID, no matter what EID is used to represent it in NEW_SUBTREE.
- *
- * For the new subtree root element, if TO_EID is -1, generate a new EID,
- * otherwise alter (if it exists) or instantiate the element TO_EID.
- *
- * Set the new subtree root element's parent to NEW_PARENT_EID and name to
- * NEW_NAME.
- */
-svn_error_t *
-svn_branch_map_add_subtree(svn_branch_state_t *to_branch,
- int to_eid,
- svn_branch_eid_t new_parent_eid,
- const char *new_name,
- svn_element_tree_t *new_subtree,
- apr_pool_t *scratch_pool);
-
/* Return the branch-relative path of element EID in BRANCH.
*
* If the element EID does not currently exist in BRANCH, return NULL.
Modified: subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c?rev=1713607&r1=1713606&r2=1713607&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c Tue Nov 10 10:35:34 2015
@@ -85,6 +85,14 @@ branch_instantiate_elements(svn_branch_s
const svn_element_tree_t *elements,
apr_pool_t *scratch_pool);
+static svn_error_t *
+svn_branch_map_add_subtree(svn_branch_state_t *to_branch,
+ int to_eid,
+ svn_branch_eid_t new_parent_eid,
+ const char *new_name,
+ svn_element_tree_t *new_subtree,
+ apr_pool_t *scratch_pool);
+
/* */
static apr_pool_t *
branch_state_pool_get(svn_branch_state_t *branch)
@@ -1118,7 +1126,18 @@ svn_branch_get_eid_by_path(const svn_bra
return -1;
}
-svn_error_t *
+/* Create a copy of NEW_SUBTREE in TO_BRANCH.
+ *
+ * For each non-root element in NEW_SUBTREE, create a new element with
+ * a new EID, no matter what EID is used to represent it in NEW_SUBTREE.
+ *
+ * For the new subtree root element, if TO_EID is -1, generate a new EID,
+ * otherwise alter (if it exists) or instantiate the element TO_EID.
+ *
+ * Set the new subtree root element's parent to NEW_PARENT_EID and name to
+ * NEW_NAME.
+ */
+static svn_error_t *
svn_branch_map_add_subtree(svn_branch_state_t *to_branch,
int to_eid,
svn_branch_eid_t new_parent_eid,