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.

     1

# define Mercurial extension metadata for evolution

     2

#

     3

# Copyright 2017 Pierre-Yves David <pierre-yves.david@ens-lyon.org>

     4

#

     5

# This software may be used and distributed according to the terms of the

     6

# GNU General Public License version 2 or any later version.

     7

     8

__version__ = '8.1.0.dev'

     9

testedwith = '4.3.2 4.4.2 4.5.2 4.6.1'

    10

minimumhgversion = '4.3'

    11

buglink = 'https://bz.mercurial-scm.org/'