svn commit: r1181853 - /subversion/trunk/subversion/libsvn_wc/props.c

[hw...@apache.org]

Author: hwright
Date: Tue Oct 11 15:49:47 2011
New Revision: 1181853

URL: http://svn.apache.org/viewvc?rev=1181853&view=rev
Log:
Make philipm's compiler happy, by updating a couple of deprecated
function calls.

* subversion/libsvn_wc/props.c
  (combine_mergeinfo_props, combine_forked_mergeinfo_props):
    Use svn_mergeinfo_merge2().

Modified:
    subversion/trunk/subversion/libsvn_wc/props.c

Modified: subversion/trunk/subversion/libsvn_wc/props.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_wc/props.c?rev=1181853&r1=1181852&r2=1181853&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_wc/props.c (original)
+++ subversion/trunk/subversion/libsvn_wc/props.c Tue Oct 11 15:49:47 2011
@@ -167,7 +167,8 @@ combine_mergeinfo_props(const svn_string
 
   SVN_ERR(svn_mergeinfo_parse(&mergeinfo1, prop_val1->data, scratch_pool));
   SVN_ERR(svn_mergeinfo_parse(&mergeinfo2, prop_val2->data, scratch_pool));
-  SVN_ERR(svn_mergeinfo_merge(mergeinfo1, mergeinfo2, scratch_pool));
+  SVN_ERR(svn_mergeinfo_merge2(mergeinfo1, mergeinfo2, scratch_pool,
+                               scratch_pool));
   SVN_ERR(svn_mergeinfo_to_string(&mergeinfo_string, mergeinfo1, result_pool));
   *output = mergeinfo_string;
   return SVN_NO_ERROR;
@@ -191,12 +192,12 @@ combine_forked_mergeinfo_props(const svn
                                working_prop_val, pool));
   SVN_ERR(diff_mergeinfo_props(&r_deleted, &r_added, from_prop_val,
                                to_prop_val, pool));
-  SVN_ERR(svn_mergeinfo_merge(l_deleted, r_deleted, pool));
-  SVN_ERR(svn_mergeinfo_merge(l_added, r_added, pool));
+  SVN_ERR(svn_mergeinfo_merge2(l_deleted, r_deleted, pool, pool));
+  SVN_ERR(svn_mergeinfo_merge2(l_added, r_added, pool, pool));
 
   /* Apply the combined deltas to the base. */
   SVN_ERR(svn_mergeinfo_parse(&from_mergeinfo, from_prop_val->data, pool));
-  SVN_ERR(svn_mergeinfo_merge(from_mergeinfo, l_added, pool));
+  SVN_ERR(svn_mergeinfo_merge2(from_mergeinfo, l_added, pool, pool));
 
   SVN_ERR(svn_mergeinfo_remove2(&from_mergeinfo, l_deleted,
                                 from_mergeinfo, TRUE, pool, pool));