Author: kotkov
Date: Fri Dec  2 13:28:15 2022
New Revision: 1905692

URL: http://svn.apache.org/viewvc?rev=1905692&view=rev
Log:
On the 'pristines-on-demand-on-mwf' branch: Do not dehydrate the text-bases
at the beginning of a commit, since we're still going to dehydrate after
completing it.

* subversion/libsvn_client/commit.c
  (svn_client_commit6): Entirely remove the first svn_client__textbase_sync().
   Move the comment.

Modified:
    
subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_client/commit.c

Modified: 
subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_client/commit.c
URL: 
http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_client/commit.c?rev=1905692&r1=1905691&r2=1905692&view=diff
==============================================================================
--- 
subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_client/commit.c
 (original)
+++ 
subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_client/commit.c
 Fri Dec  2 13:28:15 2022
@@ -708,6 +708,10 @@ svn_client_commit6(const apr_array_heade
                                                    pool, pool));
     }
 
+  /* Optimization: for commit, we avoid fetching the text-bases at the
+     beginning of the operation and only delta against the text-bases that
+     are available locally.  See svn_wc__internal_transmit_text_deltas(). */
+
   SVN_ERR(determine_lock_targets(&lock_targets, ctx->wc_ctx, base_abspath,
                                  rel_targets, pool, iterpool));
 
@@ -728,16 +732,6 @@ svn_client_commit6(const apr_array_heade
       if (cmt_err)
         goto cleanup;
 
-      /* Optimization: for commit, we avoid fetching the text-bases at the
-         beginning of the operation and only delta against the text-bases that
-         are available locally.  See svn_wc__internal_transmit_text_deltas(). 
*/
-      cmt_err = svn_error_trace(
-                    svn_client__textbase_sync(NULL, lock_root,
-                                              FALSE, TRUE, ctx,
-                                              NULL, iterpool, iterpool));
-      if (cmt_err)
-        goto cleanup;
-
       APR_ARRAY_PUSH(locks_obtained, const char *) = lock_root;
     }
 


Reply via email to