Author: rinrab
Date: Wed Nov 27 12:59:52 2024
New Revision: 1922158
URL: http://svn.apache.org/viewvc?rev=1922158&view=rev
Log:
In the trunk, merge.c: Separate the code for mergeinfo adjustments by
a few newlines.
We have the following structure here:
- Declaration of the local variables related to this scope.
- find_nearest_ancestor_with_intersecting_ranges()
- Initialization of `loc1`, `loc2`, and `source` variables.
- make_conflict_versions(&left, &right)
In general, this scope is existing for proper initialization of `left` and
`right` pointers-to-structure.
* subversion/libsvn_client/merge.c
(record_tree_conflict): Ditto.
No functional changes.
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=1922158&r1=1922157&r2=1922158&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/merge.c (original)
+++ subversion/trunk/subversion/libsvn_client/merge.c Wed Nov 27 12:59:52 2024
@@ -1444,6 +1444,7 @@ record_tree_conflict(merge_cmd_baton_t *
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,
@@ -1453,6 +1454,7 @@ record_tree_conflict(merge_cmd_baton_t *
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,
