On 02.10.2018 00:48, Johan Corveleyn wrote: > 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>
We generally avoid putting e-mail addresses in the commit messages ... -- Brane
