svn commit: r1186284 - /subversion/trunk/subversion/libsvn_repos/load-fs-vtable.c

[hwright]

Author: hwright
Date: Wed Oct 19 15:50:15 2011
New Revision: 1186284

URL: http://svn.apache.org/viewvc?rev=1186284&view=rev
Log:
* subversion/libsvn_repos/load-fs-vtable.c
  (renumber_mergeinfo_revs): Use svn_mergeinfo_merge2().

Modified:
    subversion/trunk/subversion/libsvn_repos/load-fs-vtable.c

Modified: subversion/trunk/subversion/libsvn_repos/load-fs-vtable.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/load-fs-vtable.c?rev=1186284&r1=1186283&r2=1186284&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/load-fs-vtable.c (original)
+++ subversion/trunk/subversion/libsvn_repos/load-fs-vtable.c Wed Oct 19 
15:50:15 2011
@@ -320,8 +320,8 @@ renumber_mergeinfo_revs(svn_string_t **f
     }
 
   if (predates_stream_mergeinfo)
-      SVN_ERR(svn_mergeinfo_merge(final_mergeinfo, predates_stream_mergeinfo,
-                                  subpool));
+      SVN_ERR(svn_mergeinfo_merge2(final_mergeinfo, predates_stream_mergeinfo,
+                                   subpool, subpool));
 
   SVN_ERR(svn_mergeinfo_sort(final_mergeinfo, subpool));