You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2016/02/23 12:55:38 UTC
svn commit: r1731843 - /subversion/trunk/subversion/libsvn_client/resolved.c
Author: stsp
Date: Tue Feb 23 11:55:38 2016
New Revision: 1731843
URL: http://svn.apache.org/viewvc?rev=1731843&view=rev
Log:
* subversion/libsvn_client/resolved.c
(resolve_update_moved_away_node): Sleep for timestamps after updating moved
away nodes, since doing so might modify files.
Modified:
subversion/trunk/subversion/libsvn_client/resolved.c
Modified: subversion/trunk/subversion/libsvn_client/resolved.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/resolved.c?rev=1731843&r1=1731842&r2=1731843&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/resolved.c (original)
+++ subversion/trunk/subversion/libsvn_client/resolved.c Tue Feb 23 11:55:38 2016
@@ -935,6 +935,7 @@ resolve_update_moved_away_node(svn_clien
err = svn_error_compose_create(err, svn_wc__release_write_lock(ctx->wc_ctx,
lock_abspath,
scratch_pool));
+ svn_io_sleep_for_timestamps(local_abspath, scratch_pool);
SVN_ERR(err);
conflict->resolution_tree = svn_client_conflict_option_get_id(option);