subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hwri...@apache.org
Subject svn commit: r1140667 - /subversion/trunk/subversion/libsvn_client/merge.c
Date Tue, 28 Jun 2011 14:59:33 GMT
Author: hwright
Date: Tue Jun 28 14:59:33 2011
New Revision: 1140667

URL: http://svn.apache.org/viewvc?rev=1140667&view=rev
Log:
Update a couple of deprecated function calls.

* subversion/libsvn_client/merge.c
  (find_unmerged_mergeinfo, calculate_left_hand_side):
    Use svn_ra_get_mergeinfo2().

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=1140667&r1=1140666&r2=1140667&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Tue Jun 28 14:59:33 2011
@@ -9952,10 +9952,10 @@ find_unmerged_mergeinfo(svn_mergeinfo_ca
             apr_array_make(iterpool, 1, sizeof(const char *));
           APR_ARRAY_PUSH(source_repos_rel_path_as_array, const char *)
             = source_path_rel_to_session;
-          SVN_ERR(svn_ra_get_mergeinfo(source_ra_session, &subtree_catalog,
-                                       source_repos_rel_path_as_array,
-                                       source_rev, svn_mergeinfo_inherited,
-                                       FALSE, iterpool));
+          SVN_ERR(svn_ra_get_mergeinfo2(source_ra_session, &subtree_catalog,
+                                        source_repos_rel_path_as_array,
+                                        source_rev, svn_mergeinfo_inherited,
+                                        FALSE, FALSE, iterpool));
           if (subtree_catalog)
             source_mergeinfo = apr_hash_get(subtree_catalog, source_path,
                                             APR_HASH_KEY_STRING);
@@ -10297,9 +10297,10 @@ calculate_left_hand_side(const char **ur
   /* Get the mergeinfo from the source, including its descendants
      with differing explicit mergeinfo. */
   APR_ARRAY_PUSH(source_repos_rel_path_as_array, const char *) = "";
-  SVN_ERR(svn_ra_get_mergeinfo(source_ra_session, &mergeinfo_catalog,
-                               source_repos_rel_path_as_array, source_rev,
-                               svn_mergeinfo_inherited, TRUE, iterpool));
+  SVN_ERR(svn_ra_get_mergeinfo2(source_ra_session, &mergeinfo_catalog,
+                                source_repos_rel_path_as_array, source_rev,
+                                svn_mergeinfo_inherited, FALSE, TRUE,
+                                iterpool));
 
   if (mergeinfo_catalog)
     SVN_ERR(svn_mergeinfo__add_prefix_to_catalog(&mergeinfo_catalog,



Mime
View raw message