subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hwri...@apache.org
Subject svn commit: r1185650 - /subversion/trunk/subversion/libsvn_repos/rev_hunt.c
Date Tue, 18 Oct 2011 13:42:49 GMT
Author: hwright
Date: Tue Oct 18 13:42:49 2011
New Revision: 1185650

URL: http://svn.apache.org/viewvc?rev=1185650&view=rev
Log:
Update a deprecated function call, and in the process fix a segfault or two.

* subversion/libsvn_repos/rev_hunt.c
  (get_merged_mergeinfo): Use svn_mergeinfo_diff2() instead of
    svn_megeinfo_diff().

Modified:
    subversion/trunk/subversion/libsvn_repos/rev_hunt.c

Modified: subversion/trunk/subversion/libsvn_repos/rev_hunt.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_repos/rev_hunt.c?rev=1185650&r1=1185649&r2=1185650&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_repos/rev_hunt.c (original)
+++ subversion/trunk/subversion/libsvn_repos/rev_hunt.c Tue Oct 18 13:42:49 2011
@@ -1111,8 +1111,8 @@ get_merged_mergeinfo(apr_hash_t **merged
     SVN_ERR(err);
 
   /* Then calculate and merge the differences. */
-  SVN_ERR(svn_mergeinfo_diff(&deleted, &changed, prev_mergeinfo, curr_mergeinfo,
-                             FALSE, subpool));
+  SVN_ERR(svn_mergeinfo_diff2(&deleted, &changed, prev_mergeinfo,
+                              curr_mergeinfo, FALSE, pool, subpool));
   SVN_ERR(svn_mergeinfo_merge2(changed, deleted, pool, subpool));
 
   /* Store the result. */



Mime
View raw message