Mercurial > evolve
changeset 5021:edcff79a3192
evolvecmd: avoid a ctx->node->ctx conversion
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 19 Dec 2019 21:15:31 -0800 |
parents | 8f6095e88d1c |
children | 95af630d913a |
files | hgext3rd/evolve/evolvecmd.py |
diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/evolve/evolvecmd.py Thu Dec 19 13:06:29 2019 -0800 +++ b/hgext3rd/evolve/evolvecmd.py Thu Dec 19 21:15:31 2019 -0800 @@ -1041,7 +1041,7 @@ bmchanges = [] if nodenew is not None: - obsolete.createmarkers(repo, [(repo[nodesrc], (repo[nodenew],))], + obsolete.createmarkers(repo, [(orig, (repo[nodenew],))], operation=b'evolve') for book in oldbookmarks: bmchanges.append((book, nodenew)) @@ -1050,7 +1050,7 @@ if category == b'orphan': repo.ui.status(_(b"evolution of %d:%s created no changes " b"to commit\n") % (orig.rev(), orig)) - obsolete.createmarkers(repo, [(repo[nodesrc], ())], operation=b'evolve') + obsolete.createmarkers(repo, [(orig, ())], operation=b'evolve') # Behave like rebase, move bookmarks to dest for book in oldbookmarks: evolvestate[b'bookmarkchanges'].append((book, nodesrc))