svn commit: r1136838 - /subversion/trunk/subversion/libsvn_client/commit_util.c

[rhuijben]

Author: rhuijben
Date: Fri Jun 17 10:28:33 2011
New Revision: 1136838

URL: http://svn.apache.org/viewvc?rev=1136838&view=rev
Log:
* subversion/libsvn_client/commit_util.c
  (svn_client__do_commit): Following up on r1136429, r1136530 and r1136823,
    use a more informative error report for the most common ra_serf out of date
    error.

    The other RA layers report out of date earlier, but ra_serf (and probably
    neon) commonly reports out of date from here.
    An improved fix might be to fix serf/neon as this indicates that some files
    that aren't out of date may already be transfered.

Modified:
    subversion/trunk/subversion/libsvn_client/commit_util.c

Modified: subversion/trunk/subversion/libsvn_client/commit_util.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/commit_util.c?rev=1136838&r1=1136837&r2=1136838&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/commit_util.c (original)
+++ subversion/trunk/subversion/libsvn_client/commit_util.c Fri Jun 17 10:28:33 
2011
@@ -1736,6 +1736,7 @@ svn_client__do_commit(const char *base_u
       const svn_checksum_t *new_text_base_md5_checksum;
       const svn_checksum_t *new_text_base_sha1_checksum;
       svn_boolean_t fulltext = FALSE;
+      svn_error_t *err;
 
       svn_pool_clear(iterpool);
 
@@ -1759,11 +1760,19 @@ svn_client__do_commit(const char *base_u
           && ! (item->state_flags & SVN_CLIENT_COMMIT_ITEM_IS_COPY))
         fulltext = TRUE;
 
-      SVN_ERR(svn_wc_transmit_text_deltas3(&new_text_base_md5_checksum,
-                                           &new_text_base_sha1_checksum,
-                                           ctx->wc_ctx, item->path,
-                                           fulltext, editor, mod->file_baton,
-                                           result_pool, iterpool));
+      err = svn_wc_transmit_text_deltas3(&new_text_base_md5_checksum,
+                                         &new_text_base_sha1_checksum,
+                                         ctx->wc_ctx, item->path,
+                                         fulltext, editor, mod->file_baton,
+                                         result_pool, iterpool);
+
+      if (err)
+        return svn_error_return(fixup_out_of_date_error(item->path,
+                                                        base_url,
+                                                        item->session_relpath,
+                                                        svn_node_file,
+                                                        err, ctx, iterpool));
+
       if (md5_checksums)
         apr_hash_set(*md5_checksums, item->path, APR_HASH_KEY_STRING,
                      new_text_base_md5_checksum);