Skip to content
Snippets Groups Projects
Commit 8c2f1e2a authored by Mads Kiilerich's avatar Mads Kiilerich
Browse files

transplant: use context ancestor instead of changelog ancestor

We want to move in this direction. ctx.ancestor is in a better position for
handling a situation with multiple ancestors.
parent 298c9f34
No related branches found
No related tags found
No related merge requests found
......@@ -568,4 +568,5 @@
if not heads:
heads = repo.heads()
ancestors = []
ctx = repo[dest]
for head in heads:
......@@ -571,5 +572,5 @@
for head in heads:
ancestors.append(repo.changelog.ancestor(dest, head))
ancestors.append(ctx.ancestor(repo[head]).node())
for node in repo.changelog.nodesbetween(ancestors, heads)[0]:
if match(node):
yield node
......
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