Show More
@@ -415,6 +415,10 b' def mergecopies(repo, c1, c2, base):' | |||||
415 | # value, so we should rely on making sure copytracing is on such cases |
|
415 | # value, so we should rely on making sure copytracing is on such cases | |
416 | return {}, {}, {}, {}, {} |
|
416 | return {}, {}, {}, {}, {} | |
417 |
|
417 | |||
|
418 | if usechangesetcentricalgo(repo): | |||
|
419 | # The heuristics don't make sense when we need changeset-centric algos | |||
|
420 | return _fullcopytracing(repo, c1, c2, base) | |||
|
421 | ||||
418 | # Copy trace disabling is explicitly below the node == p1 logic above |
|
422 | # Copy trace disabling is explicitly below the node == p1 logic above | |
419 | # because the logic above is required for a simple copy to be kept across a |
|
423 | # because the logic above is required for a simple copy to be kept across a | |
420 | # rebase. |
|
424 | # rebase. |
General Comments 0
You need to be logged in to leave comments.
Login now