On Thu, Aug 30, 2018 at 1:39 PM <s...@apache.org> wrote: > > Author: stsp > Date: Thu Aug 30 11:39:40 2018 > New Revision: 1839662 > > URL: http://svn.apache.org/viewvc?rev=1839662&view=rev > Log: > 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 <d...@des.no> > > * 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.
In the above commit message, a small confusion / nit that came up while reviewing this change for backport to 1.10.x: the function find_operative_moves was not affected by this revision. It just isn't called anymore from find_revision_for_suspected_deletion when moves is NULL. -- Johan
