On the 'apply-processor' branch: Merge changes from trunk@1922159, re…

…solving

conflicts in merge.c manually, due to specific changes in the scope of this
branch.

git-svn-id: https://svn.apache.org/repos/asf/subversion/branches/apply-processor@1922161 13f79535-47bb-0310-9956-ffa450edef68

.asf.yaml

@@ -19,5 +19,17 @@
 # .asf.yml -- ASF infra services configuration
 #
 
-notifications:
-  jobs: [email protected]
+# GitHub Action notifications, see 
+# https://github.com/apache/infrastructure-asfyaml?tab=readme-ov-file
+#
+# However, according to discussion with Humbedooh on Slack the-asf#Infra,
+# it require a r/w Git repository, so the below doesn't work.
+#
+# Humbedooh has kindly helped us hard-code a one-off notification which
+# doesn't rely on .asf.yaml.
+#
+# Commenting out, but keeping in place as a sticky-note for future changes.
+#
+# For reference, this is the hard-coded configuration:
+#notifications:
+#  jobs: [email protected]

subversion/libsvn_client/merge_processor.c

@@ -616,37 +616,39 @@ record_tree_conflict(merge_apply_processor_baton_t *merge_b,
 #if TODO_FILTER_MERGEINFO
       if (HONOR_MERGEINFO(merge_b) && merge_b->merge_source.ancestral)
         {
-          struct svn_client__merge_source_t *source;
+          svn_client__merge_source_t *source;
           svn_client__pathrev_t *loc1;
           svn_client__pathrev_t *loc2;
-          svn_merge_range_t range =
-            {SVN_INVALID_REVNUM, SVN_INVALID_REVNUM, TRUE};
+          svn_revnum_t start_rev;
+          svn_revnum_t end_rev;
 
           /* We are honoring mergeinfo so do not blindly record
            * a conflict describing the merge of
            * SOURCE->LOC1->URL@SOURCE->LOC1->REV through
            * SOURCE->LOC2->URL@SOURCE->LOC2->REV
            * but figure out the actual revision range merged. */
           (void)find_nearest_ancestor_with_intersecting_ranges(
-            &(range.start), &(range.end),
+            &start_rev, &end_rev,
             merge_b->children_with_mergeinfo,
             action != svn_wc_conflict_action_delete,
             local_abspath);
+
           loc1 = svn_client__pathrev_dup(merge_b->merge_source.loc1,
                                          scratch_pool);
           loc2 = svn_client__pathrev_dup(merge_b->merge_source.loc2,
                                          scratch_pool);
-          loc1->rev = range.start;
-          loc2->rev = range.end;
+          loc1->rev = start_rev;
+          loc2->rev = end_rev;
           source = svn_client__merge_source_create(loc1, loc2,
                                                    merge_b->merge_source.ancestral,
                                                    scratch_pool);
+
           SVN_ERR(make_conflict_versions(&left, &right, local_abspath,
                                          merge_left_node_kind,
                                          merge_right_node_kind,
                                          source, merge_b->target,
                                          result_pool, scratch_pool));
-        }
+      }
       else
 #endif
         SVN_ERR(make_conflict_versions(&left, &right, local_abspath,