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

Posted to commits@subversion.apache.org by iv...@apache.org on 2012/06/15 00:01:00 UTC

svn commit: r1350409 - /subversion/trunk/subversion/libsvn_client/merge.c

Author: ivan
Date: Thu Jun 14 22:01:00 2012
New Revision: 1350409

URL: http://svn.apache.org/viewvc?rev=1350409&view=rev
Log:
Small optimization in merge code.

* subversion/libsvn_client/merge.c
  (get_operative_immediate_children): Do not request all revision properties,
   since we're looking only for changed paths.


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=1350409&r1=1350408&r2=1350409&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Thu Jun 14 22:01:00 2012
@@ -7475,7 +7475,8 @@ get_operative_immediate_children(apr_has
   APR_ARRAY_PUSH(log_targets, const char *) = "";
   SVN_ERR(svn_ra_get_log2(ra_session, log_targets, youngest_rev,
                           oldest_rev, 0, TRUE, FALSE, FALSE,
-                          NULL, log_find_operative_subtree_revs,
+                          apr_array_make(scratch_pool, 0, sizeof(const char *)),
+                          log_find_operative_subtree_revs,
                           &log_baton, scratch_pool));
 
   return SVN_NO_ERROR;