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

Provenance
peterAuthored on Oct 8 2018, 8:44 AM
Parents
rGf3520a04ffc9: Vendor import svn-1.10.2
Branches
Unknown
Tags
Unknown

Event Timeline