subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1463803 - /subversion/trunk/subversion/libsvn_client/commit.c
Date Wed, 03 Apr 2013 00:54:57 GMT
Author: julianfoad
Date: Wed Apr  3 00:54:57 2013
New Revision: 1463803

URL: http://svn.apache.org/r1463803
Log:
* subversion/libsvn_client/commit.c
  (svn_client_commit6): Fix a sleep-for-timestamps bug I introduced in
    r1463721.

Found by: philip

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

Modified: subversion/trunk/subversion/libsvn_client/commit.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/commit.c?rev=1463803&r1=1463802&r2=1463803&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/commit.c (original)
+++ subversion/trunk/subversion/libsvn_client/commit.c Wed Apr  3 00:54:57 2013
@@ -586,6 +586,7 @@ svn_client_commit6(const apr_array_heade
   svn_error_t *bump_err = SVN_NO_ERROR;
   svn_error_t *unlock_err = SVN_NO_ERROR;
   svn_boolean_t commit_in_progress = FALSE;
+  svn_boolean_t timestamp_sleep = FALSE;
   svn_commit_info_t *commit_info = NULL;
   apr_pool_t *iterpool = svn_pool_create(pool);
   const char *current_abspath;
@@ -945,6 +946,11 @@ svn_client_commit6(const apr_array_heade
   /* Make a note that we have a commit-in-progress. */
   commit_in_progress = TRUE;
 
+  /* We'll assume that, once we pass this point, we are going to need to
+   * sleep for timestamps.  Really, we may not need to do unless and until
+   * we reach the point where we post-commit 'bump' the WC metadata. */
+  timestamp_sleep = TRUE;
+
   /* Perform the commit. */
   cmt_err = svn_error_trace(
               svn_client__do_commit(base_url, commit_items, editor, edit_baton,
@@ -987,7 +993,7 @@ svn_client_commit6(const apr_array_heade
 
  cleanup:
   /* Sleep to ensure timestamp integrity. */
-  if (commit_in_progress)
+  if (timestamp_sleep)
     svn_io_sleep_for_timestamps(base_abspath, pool);
 
   /* Abort the commit if it is still in progress. */



Mime
View raw message