svn commit: r1030500 - /subversion/trunk/subversion/libsvn_client/copy.c

[ju...@apache.org]

Author: julianfoad
Date: Wed Nov  3 15:29:32 2010
New Revision: 1030500

URL: http://svn.apache.org/viewvc?rev=1030500&view=rev
Log:
* subversion/libsvn_client/copy.c
  (repos_to_wc_copy_single): Sleep for timestamps only after completing
    the copy, and do it in the same way for both file and directory
    code paths.

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

Modified: subversion/trunk/subversion/libsvn_client/copy.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/copy.c?rev=1030500&r1=1030499&r2=1030500&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/copy.c (original)
+++ subversion/trunk/subversion/libsvn_client/copy.c Wed Nov  3 15:29:32 2010
@@ -1428,9 +1428,12 @@ repos_to_wc_copy_single(svn_client__copy
 
   if (pair->src_kind == svn_node_dir)
     {
+      svn_boolean_t sleep_needed = FALSE;
+
       /* Make a new checkout of the requested source. While doing so,
        * resolve pair->src_revnum to an actual revision number in case it
-       * was until now 'invalid' meaning 'head'. */
+       * was until now 'invalid' meaning 'head'.  Ask this function not to
+       * sleep for timestamps, by passing a sleep_needed output param. */
       SVN_ERR(svn_client__checkout_internal(&pair->src_revnum,
                                             pair->src_original,
                                             pair->dst_abspath_or_url,
@@ -1438,7 +1441,7 @@ repos_to_wc_copy_single(svn_client__copy
                                             &pair->src_op_revision, NULL,
                                             svn_depth_infinity,
                                             ignore_externals, FALSE, TRUE,
-                                            NULL, ctx, pool));
+                                            &sleep_needed, ctx, pool));
 
       /* Rewrite URLs recursively, remove wcprops, and mark everything
          as 'copied' -- assuming that the src and dst are from the
@@ -1529,10 +1532,10 @@ repos_to_wc_copy_single(svn_client__copy
           notify->kind = pair->src_kind;
           (*ctx->notify_func2)(ctx->notify_baton2, notify, pool);
         }
-
-      svn_io_sleep_for_timestamps(pair->dst_abspath_or_url, pool);
     }
 
+  svn_io_sleep_for_timestamps(pair->dst_abspath_or_url, pool);
+
   return SVN_NO_ERROR;
 }