Author: rinrab
Date: Mon Nov 25 11:56:37 2024
New Revision: 1922073
URL: http://svn.apache.org/viewvc?rev=1922073&view=rev
Log:
On the 'apply-processor' branch: (one more follow-up to r1922048)
Remove find_nearest_ancestor_with_intersecting_ranges() function forward
declaration merge_processor.c; We have already removed this function from
merge_processor.c (since this function is actually related to merge.c), but
we forgot to do so with the forwardly declared one.
* subversion/libsvn_client/merge_processor.c
(find_nearest_ancestor_with_intersecting_ranges): Remove forward declaration.
Modified:
subversion/branches/apply-processor/subversion/libsvn_client/merge_processor.c
Modified:
subversion/branches/apply-processor/subversion/libsvn_client/merge_processor.c
URL:
http://svn.apache.org/viewvc/subversion/branches/apply-processor/subversion/libsvn_client/merge_processor.c?rev=1922073&r1=1922072&r2=1922073&view=diff
==============================================================================
---
subversion/branches/apply-processor/subversion/libsvn_client/merge_processor.c
(original)
+++
subversion/branches/apply-processor/subversion/libsvn_client/merge_processor.c
Mon Nov 25 11:56:37 2024
@@ -544,15 +544,6 @@ record_skip(merge_apply_processor_baton_
return SVN_NO_ERROR;
}
-/* Forward declaration */
-static svn_client__merge_path_t *
-find_nearest_ancestor_with_intersecting_ranges(
- svn_revnum_t *start,
- svn_revnum_t *end,
- const apr_array_header_t *children_with_mergeinfo,
- svn_boolean_t path_is_own_ancestor,
- const char *local_abspath);
-
/* Record a tree conflict in the WC, unless this is a dry run or a record-
* only merge, or if a tree conflict is already flagged for the VICTIM_PATH.
* (The latter can happen if a merge-tracking-aware merge is doing multiple
