subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhuij...@apache.org
Subject svn commit: r1443032 - /subversion/trunk/subversion/libsvn_client/merge.c
Date Wed, 06 Feb 2013 15:56:25 GMT
Author: rhuijben
Date: Wed Feb  6 15:56:25 2013
New Revision: 1443032

URL: http://svn.apache.org/viewvc?rev=1443032&view=rev
Log:
* subversion/libsvn_client/merge.c
  (merge_file_added): Set use_sleep here, in the only place where we introduce
    unmodified nodes, instead of globally on every merge drive.
  (do_file_merge): Remove comment of old setter. (Accidentally changed in
    r1443030)

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

Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1443032&r1=1443031&r2=1443032&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Wed Feb  6 15:56:25 2013
@@ -2374,6 +2374,9 @@ merge_file_added(const char *relpath,
                                          merge_b->ctx->cancel_func,
                                          merge_b->ctx->cancel_baton,
                                          scratch_pool));
+
+          /* Caller must call svn_sleep_for_timestamps() */
+          *merge_b->use_sleep = TRUE;
         }
     }
 
@@ -7374,7 +7377,6 @@ do_file_merge(svn_mergeinfo_catalog_t re
         }
     }
 
-  /* Caller must call svn_sleep_for_timestamps() */
   merge_b->notify_begin.nodes_with_mergeinfo = NULL;
 
   svn_pool_destroy(iterpool);



Mime
View raw message