Log Message: |
Don't scan for moves for 'local missing' conflicts unless a YCA is known.
Prevent the resolver from embarking on an endless search in case of
a 'incoming edit vs. local missing' conflict where no YCA can be
found which would cap our search through history.
Reported by: Dag-Erling Smørgrav <des{_AT_}des.no>
https://svn.haxx.se/users/archive-2018-08/0038.shtml
* subversion/libsvn_client/conflicts.c
(find_deleted_rev): Account for a NULL moves-table.
(find_operative_moves, find_revision_for_suspected_deletion): Make search
for moves optional. The caller can now pass a NULL moves array to indicate
that moves should not be searched for.
(conflict_tree_get_details_local_missing): Only ask for move information if
a YCA was found.
|