subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hwri...@apache.org
Subject svn commit: r1185365 - /subversion/trunk/subversion/libsvn_client/mergeinfo.c
Date Mon, 17 Oct 2011 20:43:16 GMT
Author: hwright
Date: Mon Oct 17 20:43:16 2011
New Revision: 1185365

URL: http://svn.apache.org/viewvc?rev=1185365&view=rev
Log:
* subversion/libsvn_client/mergeinfo.c
  (svn_client_mergeinfo_log): Use svn_mergeinfo_merge2().

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=1185365&r1=1185364&r2=1185365&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/mergeinfo.c (original)
+++ subversion/trunk/subversion/libsvn_client/mergeinfo.c Mon Oct 17 20:43:16 2011
@@ -1905,9 +1905,9 @@ svn_client_mergeinfo_log(svn_boolean_t f
                                            subtree_history,
                                            subtree_source_history, TRUE,
                                            scratch_pool, iterpool));
-          SVN_ERR(svn_mergeinfo_merge(subtree_mergeinfo,
-                                      merged_via_history,
-                                      scratch_pool));
+          SVN_ERR(svn_mergeinfo_merge2(subtree_mergeinfo,
+                                       merged_via_history,
+                                       scratch_pool, scratch_pool));
         }
 
       SVN_ERR(svn_mergeinfo_inheritable2(&subtree_inheritable_mergeinfo,



Mime
View raw message