comparison hgext/gpg.py @ 30201:856ead835f56

checkcopies: handle divergences contained entirely in tca::ctx During a graftlike merge, _checkcopies runs from ctx to tca, possibly passing over the merge base. If there is a rename both before and after the base, then we're actually dealing with divergent renames. If there is no rename on the other side of tca, then the divergence is contained entirely in the range of one _checkcopies invocation, and should be detected "in the loop" without having to rely on the other _checkcopies pass.
author Gábor Stefanik <gabor.stefanik@nng.com>
date Wed, 12 Oct 2016 11:54:03 +0200
parents d5883fd055c6
children 82f1ef8b4477
comparison
equal deleted inserted replaced
30200:a2804ddcf9ae 30201:856ead835f56