Author: rinrab
Date: Mon Nov 25 18:53:49 2024
New Revision: 1922092
URL: http://svn.apache.org/viewvc?rev=1922092&view=rev
Log:
On the 'apply-processor' branch: Declare processor in a scope of a loop
instead of scoping it to the whole function.
* subversion/libsvn_client/merge.c
(do_merge): Ditto.
No functional changes.
Modified:
subversion/branches/apply-processor/subversion/libsvn_client/merge.c
Modified: subversion/branches/apply-processor/subversion/libsvn_client/merge.c
URL:
http://svn.apache.org/viewvc/subversion/branches/apply-processor/subversion/libsvn_client/merge.c?rev=1922092&r1=1922091&r2=1922092&view=diff
==============================================================================
--- subversion/branches/apply-processor/subversion/libsvn_client/merge.c
(original)
+++ subversion/branches/apply-processor/subversion/libsvn_client/merge.c Mon
Nov 25 18:53:49 2024
@@ -7436,7 +7436,6 @@ do_merge(apr_hash_t **modified_subtrees,
svn_ra_session_t *ra_session1 = NULL, *ra_session2 = NULL;
const char *old_src_session_url = NULL;
apr_pool_t *iterpool;
- const svn_diff_tree_processor_t *processor;
SVN_ERR_ASSERT(svn_dirent_is_absolute(target->abspath));
@@ -7544,6 +7543,7 @@ do_merge(apr_hash_t **modified_subtrees,
svn_client__merge_source_t *source =
APR_ARRAY_IDX(merge_sources, i, svn_client__merge_source_t *);
single_range_conflict_report_t *conflicted_range_report;
+ const svn_diff_tree_processor_t *processor;
svn_client__apply_processor_callbacks_t cb_table = { 0 };
cb_table.conflicted_path = apply_processor_conflicted_path;
