Author: rhuijben
Date: Thu Aug 15 09:00:43 2013
New Revision: 1514208
URL: http://svn.apache.org/r1514208
Log:
* subversion/libsvn_client/commit.c
(svn_client_commit6): Following up on r1508438, use the original
base_abspath when there is no common working copy. This avoids
the performance regression on Windows when committing from multiple
working copies without a common ancestor, while in general still
avoiding the originally fixed problems.
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=1514208&r1=1514207&r2=1514208&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/commit.c (original)
+++ subversion/trunk/subversion/libsvn_client/commit.c Thu Aug 15 09:00:43 2013
@@ -1030,16 +1030,16 @@ svn_client_commit6(const apr_array_heade
working copies. */
if (timestamp_sleep)
{
- const char *wcroot_abspath;
- svn_error_t *err = svn_wc__get_wcroot(&wcroot_abspath, ctx->wc_ctx,
+ const char *sleep_abspath;
+ svn_error_t *err = svn_wc__get_wcroot(&sleep_abspath, ctx->wc_ctx,
base_abspath, pool, pool);
if (err)
{
svn_error_clear(err);
- wcroot_abspath = NULL;
+ sleep_abspath = base_abspath;
}
- svn_io_sleep_for_timestamps(wcroot_abspath, pool);
+ svn_io_sleep_for_timestamps(sleep_abspath, pool);
}
/* Abort the commit if it is still in progress. */
