[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn commit: r1839662 - /subversion/trunk/subversion/libsvn_client/conflicts.c

From: Johan Corveleyn <jcorvel_at_gmail.com>
Date: Tue, 2 Oct 2018 00:48:52 +0200

On Thu, Aug 30, 2018 at 1:39 PM <stsp_at_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 <des_at_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

Received on 2018-10-02 00:49:22 CEST

This is an archived mail posted to the Subversion Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.