svn commit: r1183380 - /subversion/trunk/subversion/libsvn_client/copy.c

[hw...@apache.org]

Author: hwright
Date: Fri Oct 14 14:58:24 2011
New Revision: 1183380

URL: http://svn.apache.org/viewvc?rev=1183380&view=rev
Log:
* subversion/libsvn_client/copy.c
  (extend_wc_mergeinfo, wc_to_repos_copy): Use svn_mergeinfo_merge2().

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

Modified: subversion/trunk/subversion/libsvn_client/copy.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/copy.c?rev=1183380&r1=1183379&r2=1183380&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/copy.c (original)
+++ subversion/trunk/subversion/libsvn_client/copy.c Fri Oct 14 14:58:24 2011
@@ -150,7 +150,7 @@ extend_wc_mergeinfo(const char *target_a
 
   /* Combine the provided mergeinfo with any mergeinfo from the WC. */
   if (wc_mergeinfo && mergeinfo)
-    SVN_ERR(svn_mergeinfo_merge(wc_mergeinfo, mergeinfo, pool));
+    SVN_ERR(svn_mergeinfo_merge2(wc_mergeinfo, mergeinfo, pool, pool));
   else if (! wc_mergeinfo)
     wc_mergeinfo = mergeinfo;
 
@@ -1400,7 +1400,8 @@ wc_to_repos_copy(const apr_array_header_
                                           pair->src_abspath_or_url,
                                           iterpool, iterpool));
       if (wc_mergeinfo && mergeinfo)
-        SVN_ERR(svn_mergeinfo_merge(mergeinfo, wc_mergeinfo, iterpool));
+        SVN_ERR(svn_mergeinfo_merge2(mergeinfo, wc_mergeinfo, iterpool,
+                                     iterpool));
       else if (! mergeinfo)
         mergeinfo = wc_mergeinfo;
       if (mergeinfo)