Author: rhuijben
Date: Mon Sep 24 14:05:39 2018
New Revision: 1841850
URL: http://svn.apache.org/viewvc?rev=1841850&view=rev
Log:
Remove an unused result_pool argument of private function for conflict
handling.
* subversion/svn/conflict-callbacks.c
(resolve_conflict_interactively):
Remove unused (or not properly used) argument
(svn_cl__resolve_conflict): Update caller.
Modified:
subversion/trunk/subversion/svn/conflict-callbacks.c
Modified: subversion/trunk/subversion/svn/conflict-callbacks.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/conflict-callbacks.c?rev=1841850&r1=1841849&r2=1841850&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/conflict-callbacks.c (original)
+++ subversion/trunk/subversion/svn/conflict-callbacks.c Mon Sep 24 14:05:39
2018
@@ -1977,7 +1977,6 @@ resolve_conflict_interactively(svn_boole
svn_cmdline_prompt_baton_t *pb,
svn_cl__conflict_stats_t *conflict_stats,
svn_client_ctx_t *ctx,
- apr_pool_t *result_pool,
apr_pool_t *scratch_pool)
{
svn_boolean_t text_conflicted;
@@ -2011,7 +2010,7 @@ resolve_conflict_interactively(svn_boole
if (props_conflicted->nelts > 0)
SVN_ERR(handle_prop_conflicts(resolved, postponed, quit, &merged_propval,
path_prefix, pb, editor_cmd, config,
conflict,
- conflict_stats, ctx, result_pool,
scratch_pool));
+ conflict_stats, ctx, scratch_pool,
scratch_pool));
if (tree_conflicted)
SVN_ERR(handle_tree_conflict(resolved, postponed, quit,
printed_description,
conflict, path_prefix, pb, conflict_stats,
ctx,
@@ -2264,7 +2263,7 @@ svn_cl__resolve_conflict(svn_boolean_t *
editor_cmd, ctx->config,
path_prefix, pb,
conflict_stats, ctx,
- iterpool, iterpool);
+ iterpool);
if (err && err->apr_err == SVN_ERR_WC_CONFLICT_RESOLVER_FAILURE)
{
/* Conflict resolution has failed. Let the user try again.
