svn commit: r1182985 - /subversion/trunk/subversion/svnrdump/load_editor.c

[hwright]

Author: hwright
Date: Thu Oct 13 17:04:22 2011
New Revision: 1182985

URL: http://svn.apache.org/viewvc?rev=1182985&view=rev
Log:
* subversion/svnrdump/load_editor.c
  (renumber_mergeinfo_revs): Update another deprecated function call to
    svn_mergeinfo_merge2().

Modified:
    subversion/trunk/subversion/svnrdump/load_editor.c

Modified: subversion/trunk/subversion/svnrdump/load_editor.c
URL: 
http://svn.apache.org/viewvc/subversion/trunk/subversion/svnrdump/load_editor.c?rev=1182985&r1=1182984&r2=1182985&view=diff
==============================================================================
--- subversion/trunk/subversion/svnrdump/load_editor.c (original)
+++ subversion/trunk/subversion/svnrdump/load_editor.c Thu Oct 13 17:04:22 2011
@@ -312,8 +312,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));