Author: hwright
Date: Thu May 19 09:25:15 2011
New Revision: 1124626
URL: http://svn.apache.org/viewvc?rev=1124626&view=rev
Log:
Update callers in response r1124599.
* subversion/libsvn_client/merge.c
(get_mergeinfo_paths),
(merge_reintegrate_locked),
* subversion/libsvn_client/mergeinfo.c
(svn_client__get_wc_mergeinfo_catalog),
* subversion/libsvn_client/cleanup.c
(svn_client_upgrade):
Update callers.
Modified:
subversion/trunk/subversion/libsvn_client/cleanup.c
subversion/trunk/subversion/libsvn_client/merge.c
subversion/trunk/subversion/libsvn_client/mergeinfo.c
Modified: subversion/trunk/subversion/libsvn_client/cleanup.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/cleanup.c?rev=1124626&r1=1124625&r2=1124626&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/cleanup.c (original)
+++ subversion/trunk/subversion/libsvn_client/cleanup.c Thu May 19 09:25:15 2011
@@ -143,9 +143,9 @@ svn_client_upgrade(const char *path,
upgrade to avoid that errors in the externals causes the wc upgrade to
fail. Thanks to caching the performance penalty of walking the wc a
second time shouldn't be too severe */
- SVN_ERR(svn_client_propget3(&externals, SVN_PROP_EXTERNALS, path, &rev,
+ SVN_ERR(svn_client_propget4(&externals, SVN_PROP_EXTERNALS, path, &rev,
&rev, NULL, svn_depth_infinity, NULL, ctx,
- scratch_pool));
+ scratch_pool, scratch_pool));
iterpool = svn_pool_create(scratch_pool);
Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1124626&r1=1124625&r2=1124626&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Thu May 19 09:25:15 2011
@@ -5628,10 +5628,12 @@ get_mergeinfo_paths(apr_array_header_t *
working_revision.kind = svn_opt_revision_working;
/* Case 1: Subtrees with explicit mergeinfo. */
- SVN_ERR(svn_client_propget3(&subtrees_with_mergeinfo, SVN_PROP_MERGEINFO,
- merge_cmd_baton->target_abspath,
&working_revision,
+ SVN_ERR(svn_client_propget4(&subtrees_with_mergeinfo, SVN_PROP_MERGEINFO,
+ merge_cmd_baton->target_abspath,
+ &working_revision,
&working_revision, NULL, depth, NULL,
- merge_cmd_baton->ctx, scratch_pool));
+ merge_cmd_baton->ctx, scratch_pool,
+ scratch_pool));
if (subtrees_with_mergeinfo)
{
@@ -10384,10 +10386,10 @@ merge_reintegrate_locked(const char *sou
/* Find all the subtree's in TARGET_WCPATH that have explicit mergeinfo. */
working_revision.kind = svn_opt_revision_working;
- SVN_ERR(svn_client_propget3(&subtrees_with_mergeinfo, SVN_PROP_MERGEINFO,
+ SVN_ERR(svn_client_propget4(&subtrees_with_mergeinfo, SVN_PROP_MERGEINFO,
target_abspath, &working_revision,
&working_revision, NULL, svn_depth_infinity,
- NULL, ctx, scratch_pool));
+ NULL, ctx, scratch_pool, scratch_pool));
/* Open two RA sessions, one to our source and one to our target. */
SVN_ERR(svn_wc__node_get_url(&target_url, ctx->wc_ctx, target_abspath,
Modified: subversion/trunk/subversion/libsvn_client/mergeinfo.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/mergeinfo.c?rev=1124626&r1=1124625&r2=1124626&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/mergeinfo.c (original)
+++ subversion/trunk/subversion/libsvn_client/mergeinfo.c Thu May 19 09:25:15
2011
@@ -375,12 +375,12 @@ svn_client__get_wc_mergeinfo_catalog(svn
opt.kind = svn_opt_revision_unspecified;
- SVN_ERR(svn_client_propget3(&mergeinfo_props,
+ SVN_ERR(svn_client_propget4(&mergeinfo_props,
SVN_PROP_MERGEINFO,
local_abspath,
&opt, &opt,
NULL, svn_depth_infinity, NULL,
- ctx, scratch_pool));
+ ctx, scratch_pool, scratch_pool));
/* Convert *mergeinfo_props into a proper svn_mergeinfo_catalog_t */
for (hi = apr_hash_first(scratch_pool, mergeinfo_props);
