HomeFreeBSD

Pull upstream r1839662

Description

Pull upstream r1839662

"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."

Requested by: des

Details

Committed
peterOct 8 2018, 8:44 AM
Parents
rS339233: Tag svn-1.10.2 import
Branches
Unknown
Tags
Unknown