You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@subversion.apache.org by hw...@apache.org on 2012/05/16 18:41:32 UTC

svn commit: r1339261 - /subversion/trunk/subversion/libsvn_client/merge.c

Author: hwright
Date: Wed May 16 16:41:32 2012
New Revision: 1339261

URL: http://svn.apache.org/viewvc?rev=1339261&view=rev
Log:
Update deprecated function use.

* subversion/libsvn_client/merge.c
  (find_last_merged_location): Use svn_mergeinfo_remove2().

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

Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1339261&r1=1339260&r2=1339261&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Wed May 16 16:41:32 2012
@@ -11258,9 +11258,9 @@ find_last_merged_location(svn_client__pa
 
   /* Remove any locations that match (a), (b) or (c). */
   /* For (a), remove any locations that are in TARGET's mergeinfo. */
-  SVN_ERR(svn_mergeinfo_remove(&eligible_locations->history,
-                               target_mergeinfo, eligible_locations->history,
-                               scratch_pool));
+  SVN_ERR(svn_mergeinfo_remove2(&eligible_locations->history,
+                                target_mergeinfo, eligible_locations->history,
+                                TRUE, scratch_pool, scratch_pool));
   /* For (b) ... */
 
   /* For (c) ... */