Skip to content
Snippets Groups Projects
Commit 29a9bf08 authored by Pierre-Yves David's avatar Pierre-Yves David :octopus:
Browse files

copies: simplify the call to _merge_copies_dict

Let's get the argument into the right order, then call the function once.
parent 15ca691f
No related branches found
No related tags found
No related merge requests found
......@@ -405,7 +405,5 @@
# changeset based copies. It was made without regards with
# potential filelog related behavior.
if parent == 1:
_merge_copies_dict(
othercopies, newcopies, isancestor, changes
)
minor, major = othercopies, newcopies
else:
......@@ -411,8 +409,7 @@
else:
_merge_copies_dict(
newcopies, othercopies, isancestor, changes
)
all_copies[c] = newcopies
minor, major = newcopies, othercopies
_merge_copies_dict(minor, major, isancestor, changes)
all_copies[c] = minor
final_copies = {}
for dest, (tt, source) in all_copies[targetrev].items():
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment