# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 2019-04-17 21:44:18
# Node ID a6be3af3a39717b941e00e11725e41994180fdd7
# Parent  d8ca7b99fc514ef60bfb30e37bb39fedcc9b66ec

copies: ignore heuristics copytracing when using changeset-centric algos

Differential Revision: https://phab.mercurial-scm.org/D6269

diff --git a/mercurial/copies.py b/mercurial/copies.py
--- a/mercurial/copies.py
+++ b/mercurial/copies.py
@@ -415,6 +415,10 @@ def mergecopies(repo, c1, c2, base):
         # value, so we should rely on making sure copytracing is on such cases
         return {}, {}, {}, {}, {}
 
+    if usechangesetcentricalgo(repo):
+        # The heuristics don't make sense when we need changeset-centric algos
+        return _fullcopytracing(repo, c1, c2, base)
+
     # Copy trace disabling is explicitly below the node == p1 logic above
     # because the logic above is required for a simple copy to be kept across a
     # rebase.