You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by ju...@apache.org on 2018/06/14 17:29:35 UTC

svn commit: r1833532 - /subversion/trunk/subversion/libsvn_client/shelf.c

Author: julianfoad
Date: Thu Jun 14 17:29:35 2018
New Revision: 1833532

URL: http://svn.apache.org/viewvc?rev=1833532&view=rev
Log:
Shelving: Sleep for timestamps after 'unshelve'.

This should fix test failures we've been seeing particulary on a MacOSX buildbot
(as apparently an HFS+ filesystem has a coarse 1s timestamp resolution).

Found by: philip

* subversion/libsvn_client/shelf.c
  (svn_client_shelf_apply): Sleep for timestamps.

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

Modified: subversion/trunk/subversion/libsvn_client/shelf.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/shelf.c?rev=1833532&r1=1833531&r2=1833532&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/shelf.c (original)
+++ subversion/trunk/subversion/libsvn_client/shelf.c Thu Jun 14 17:29:35 2018
@@ -1662,6 +1662,8 @@ svn_client_shelf_apply(svn_client_shelf_
                             apply_file_visitor, &baton,
                             scratch_pool));
 
+  svn_io_sleep_for_timestamps(shelf_version->shelf->wc_root_abspath,
+                              scratch_pool);
   return SVN_NO_ERROR;
 }