subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danie...@apache.org
Subject svn commit: r1305869 - /subversion/trunk/subversion/libsvn_client/merge.c
Date Tue, 27 Mar 2012 15:16:18 GMT
Author: danielsh
Date: Tue Mar 27 15:16:18 2012
New Revision: 1305869

URL: http://svn.apache.org/viewvc?rev=1305869&view=rev
Log:
Minor optimization.

* subversion/libsvn_client/merge.c
  (get_mergeinfo_paths): Don't bother doing an 'inserted sort' when we're
    about to sort the whole list anyway.

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=1305869&r1=1305868&r2=1305869&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Tue Mar 27 15:16:18 2012
@@ -5818,8 +5818,9 @@ get_mergeinfo_paths(apr_array_header_t *
             = svn_mergeinfo__is_noninheritable(
                 mergeinfo_child->pre_merge_mergeinfo, iterpool);
 
-          insert_child_to_merge(children_with_mergeinfo, mergeinfo_child,
-                                result_pool);
+          /* Append it.  We'll sort below. */
+          APR_ARRAY_PUSH(children_with_mergeinfo, svn_client__merge_path_t *)
+            = svn_client__merge_path_dup(mergeinfo_child, result_pool);
         }
 
       /* Sort CHILDREN_WITH_MERGEINFO by each child's path (i.e. as per



Mime
View raw message