subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1697720 - /subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c
Date Tue, 25 Aug 2015 16:24:17 GMT
Author: julianfoad
Date: Tue Aug 25 16:24:17 2015
New Revision: 1697720

URL: http://svn.apache.org/r1697720
Log:
On the 'move-tracking-2' branch: Tweak the source code layout.

* subversion/libsvn_delta/branch.c
  (svn_branch_branch_subtree): Move to a more logical location in the
    file, matching the declaration position in the header file.

Modified:
    subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c

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=1697720&r1=1697719&r2=1697720&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/branch.c Tue Aug 25 16:24:17
2015
@@ -827,6 +827,31 @@ svn_branch_instantiate_subtree(svn_branc
   return SVN_NO_ERROR;
 }
 
+svn_error_t *
+svn_branch_branch_subtree(svn_branch_state_t **new_branch_p,
+                          svn_branch_subtree_t from_subtree,
+                          svn_branch_revision_root_t *rev_root,
+                          svn_branch_state_t *to_outer_branch,
+                          svn_branch_eid_t to_outer_eid,
+                          apr_pool_t *scratch_pool)
+{
+  svn_branch_state_t *new_branch;
+
+  /* create new branch */
+  new_branch = svn_branch_add_new_branch(rev_root,
+                                         to_outer_branch, to_outer_eid,
+                                         from_subtree.root_eid,
+                                         scratch_pool);
+
+  /* Populate the new branch mapping */
+  SVN_ERR(svn_branch_instantiate_subtree(new_branch, -1, "", from_subtree,
+                                         scratch_pool));
+
+  if (new_branch_p)
+    *new_branch_p = new_branch;
+  return SVN_NO_ERROR;
+}
+
 apr_array_header_t *
 svn_branch_get_immediate_subbranches(const svn_branch_state_t *branch,
                                      apr_pool_t *result_pool,
@@ -1385,28 +1410,3 @@ svn_branch_get_id(svn_branch_state_t *br
   return id;
 }
 
-svn_error_t *
-svn_branch_branch_subtree(svn_branch_state_t **new_branch_p,
-                          svn_branch_subtree_t from_subtree,
-                          svn_branch_revision_root_t *rev_root,
-                          svn_branch_state_t *to_outer_branch,
-                          svn_branch_eid_t to_outer_eid,
-                          apr_pool_t *scratch_pool)
-{
-  svn_branch_state_t *new_branch;
-
-  /* create new branch */
-  new_branch = svn_branch_add_new_branch(rev_root,
-                                         to_outer_branch, to_outer_eid,
-                                         from_subtree.root_eid,
-                                         scratch_pool);
-
-  /* Populate the new branch mapping */
-  SVN_ERR(svn_branch_instantiate_subtree(new_branch, -1, "", from_subtree,
-                                         scratch_pool));
-
-  if (new_branch_p)
-    *new_branch_p = new_branch;
-  return SVN_NO_ERROR;
-}
-



Mime
View raw message