comparison tests/test-evolve.t @ 3882:55b8c7e7e352

compat: temporarily move copies fix to compat.py This patch moves a fixed version of copies._fullcopytracing() to compat.py as this was not fixed in core before release and also we need to do this anyway for the older versions of mercurial. This fix is that when base changeset is not ancestor of any of the merging commits, we don't throw an error. The phabricator differential which will fix this in core is https://phab.mercurial-scm.org/D3896. This fixes the traceback we get in previous changeset while relocating one of the content-divergent changeset.
author Pulkit Goyal <7895pulkit@gmail.com>
date Sat, 21 Jul 2018 02:42:29 +0530
parents 9c0b37be8582
children f7afd3a158e3 8fcee1e65e29 fb8e44c70798
comparison
equal deleted inserted replaced
3881:9cf45b94f977 3882:55b8c7e7e352