subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1704671 - /subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3e.c
Date Tue, 22 Sep 2015 17:25:50 GMT
Author: julianfoad
Date: Tue Sep 22 17:25:46 2015
New Revision: 1704671

URL: http://svn.apache.org/viewvc?rev=1704671&view=rev
Log:
On the 'move-tracking-2' branch: Tweak comments.

* subversion/libsvn_delta/compat3e.c
  (editor3_open_branch): Tweak indentation. Allow 'outer_branch_id' to be
    null, to create a top-level branch.

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

Modified: subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3e.c
URL: http://svn.apache.org/viewvc/subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3e.c?rev=1704671&r1=1704670&r2=1704671&view=diff
==============================================================================
--- subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3e.c (original)
+++ subversion/branches/move-tracking-2/subversion/libsvn_delta/compat3e.c Tue Sep 22 17:25:46
2015
@@ -1152,18 +1152,16 @@ editor3_new_eid(void *baton,
 /* An #svn_editor3_t method. */
 static svn_error_t *
 editor3_open_branch(void *baton,
-                       const char **new_branch_id_p,
-                       const char *outer_branch_id,
-                       int outer_eid,
-                       int root_eid,
-                       apr_pool_t *result_pool,
-                       apr_pool_t *scratch_pool)
+                    const char **new_branch_id_p,
+                    const char *outer_branch_id,
+                    int outer_eid,
+                    int root_eid,
+                    apr_pool_t *result_pool,
+                    apr_pool_t *scratch_pool)
 {
   ev3_from_delta_baton_t *eb = baton;
-  svn_branch_state_t *outer_branch
-    = svn_branch_revision_root_get_branch_by_id(eb->edited_rev_root,
-                                                outer_branch_id, scratch_pool);
   svn_branch_state_t *new_branch;
+  svn_branch_state_t *outer_branch = NULL;
 
   /* if the subbranch already exists, just return its bid */
   *new_branch_id_p
@@ -1175,6 +1173,9 @@ editor3_open_branch(void *baton,
   if (new_branch)
     return SVN_NO_ERROR;
 
+  if (outer_branch_id)
+    outer_branch = svn_branch_revision_root_get_branch_by_id(
+                     eb->edited_rev_root, outer_branch_id, scratch_pool);
   new_branch = svn_branch_add_new_branch(eb->edited_rev_root,
                                          outer_branch, outer_eid,
                                          root_eid, scratch_pool);



Mime
View raw message