subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1659980 - /subversion/branches/1.8.x-r1659867/subversion/libsvn_ra_serf/commit.c
Date Sun, 15 Feb 2015 18:50:23 GMT
Author: rhuijben
Date: Sun Feb 15 18:50:23 2015
New Revision: 1659980

URL: http://svn.apache.org/r1659980
Log:
On the r1659867 backport branch: Add some trunk code to avoid retrying aborts.

* subversion/libsvn_ra_serf/commit.c
  (close_edit): Mark the txn done to avoid aborting again, like how we
    do this on trunk since r1659867.

Modified:
    subversion/branches/1.8.x-r1659867/subversion/libsvn_ra_serf/commit.c

Modified: subversion/branches/1.8.x-r1659867/subversion/libsvn_ra_serf/commit.c
URL: http://svn.apache.org/viewvc/subversion/branches/1.8.x-r1659867/subversion/libsvn_ra_serf/commit.c?rev=1659980&r1=1659979&r2=1659980&view=diff
==============================================================================
--- subversion/branches/1.8.x-r1659867/subversion/libsvn_ra_serf/commit.c (original)
+++ subversion/branches/1.8.x-r1659867/subversion/libsvn_ra_serf/commit.c Sun Feb 15 18:50:23
2015
@@ -2253,6 +2253,8 @@ close_edit(void *edit_baton,
                                response_code);
     }
 
+  ctx->txn_url = NULL; /* If HTTPv2, the txn is now done */
+
   /* Inform the WC that we did a commit.  */
   if (ctx->callback)
     err = ctx->callback(commit_info, ctx->callback_baton, pool);
@@ -2272,6 +2274,8 @@ close_edit(void *edit_baton,
       handler->response_handler = svn_ra_serf__expect_empty_body;
       handler->response_baton = handler;
 
+      ctx->activity_url = NULL; /* Don't try again in abort_edit() on fail */
+
       SVN_ERR(svn_error_compose_create(
                   err,
                   svn_ra_serf__context_run_one(handler, pool)));



Mime
View raw message