subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r1148573 - /subversion/trunk/subversion/libsvn_client/mergeinfo.c
Date Tue, 19 Jul 2011 22:00:01 GMT
Author: stsp
Date: Tue Jul 19 21:59:59 2011
New Revision: 1148573

URL: http://svn.apache.org/viewvc?rev=1148573&view=rev
Log:
* subversion/libsvn_client/mergeinfo.c
  (svn_client_mergeinfo_log): Pass the iterpool as scratch_pool argument
   to svn_mergeinfo_intersect2() instead of passing the local scratch_pool.

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

Modified: subversion/trunk/subversion/libsvn_client/mergeinfo.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/mergeinfo.c?rev=1148573&r1=1148572&r2=1148573&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/mergeinfo.c (original)
+++ subversion/trunk/subversion/libsvn_client/mergeinfo.c Tue Jul 19 21:59:59 2011
@@ -1812,7 +1812,7 @@ svn_client_mergeinfo_log(svn_boolean_t f
           SVN_ERR(svn_mergeinfo_intersect2(&merged_via_history,
                                            subtree_history,
                                            subtree_source_history, TRUE,
-                                           scratch_pool, scratch_pool));
+                                           scratch_pool, iterpool));
           SVN_ERR(svn_mergeinfo_merge(subtree_mergeinfo,
                                       merged_via_history,
                                       scratch_pool));



Mime
View raw message