mercurial/pure/__init__.py
author Gábor Stefanik <gabor.stefanik@nng.com>
Thu, 13 Oct 2016 02:19:43 +0200
changeset 30197 0accd5a5ad04
parent 16438 28a90cdf0ca0
permissions -rw-r--r--
mergecopies: invoke _computenonoverlap for both base and tca during merges The algorithm of _checkcopies can only walk backwards in the DAG, never forward. Because of this, the two _checkcopies patches need to run from their respective endpoints to the TCA to cover the entire subgraph where the merge is being performed. However, detection of files new in both endpoints, as well as directory rename detection, need to run with respect to the merge base, so we need lists of new files both from the TCA's and the merge base's viewpoint to correctly detect renames in a graft-like merge scenario. (Series reworked by Pierre-Yves David)