# HG changeset patch # User Mads Kiilerich # Date 1396905471 -7200 # Node ID 8c2f1e2a11ff2dd87f920b19f56ca06441fa294a # Parent 298c9f346dde7300f99d3806d6b1631dd8d4f71f 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. diff -r 298c9f346dde -r 8c2f1e2a11ff hgext/transplant.py --- a/hgext/transplant.py Mon Apr 07 23:17:51 2014 +0200 +++ b/hgext/transplant.py Mon Apr 07 23:17:51 2014 +0200 @@ -568,8 +568,9 @@ if not heads: heads = repo.heads() ancestors = [] + ctx = repo[dest] 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