svn commit: r1922157 - /subversion/trunk/subversion/libsvn_client/merge.c

Author: rinrab
Date: Wed Nov 27 12:54:10 2024
New Revision: 1922157

URL: http://svn.apache.org/viewvc?rev=1922157&view=rev
Log:
In the trunk, merge.c: Declare start_rev and end_rev separately instead of
using a single svn_merge_range_t with later usage of its .start and .end
fields.

These two variable are being utilized as arguments of the
find_nearest_ancestor_with_intersecting_ranges() function.

This change simplifies this code a bit, without making any
functional changes.

* subversion/libsvn_client/merge.c
  (record_tree_conflict): Ditto.

Modified:
    subversion/trunk/subversion/libsvn_client/merge.c

Modified: subversion/trunk/subversion/libsvn_client/merge.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/merge.c?rev=1922157&r1=1922156&r2=1922157&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Wed Nov 27 12:54:10 2024
@@ -1431,8 +1431,8 @@ record_tree_conflict(merge_cmd_baton_t *
           struct 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
@@ -1440,7 +1440,7 @@ record_tree_conflict(merge_cmd_baton_t *
            * 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);
@@ -1448,8 +1448,8 @@ record_tree_conflict(merge_cmd_baton_t *
                                          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);