# HG changeset patch # User Martin von Zweigbergk # Date 1548181964 28800 # Node ID 9a218768bac518dba1926f059e2372a7cb8edea7 # Parent 45c0415e45b9a05020b8c5dc5c517487674101e7 pick: use scmutil.cleanupnodes() A side-effect is that `pick` should now also move bookmarks. diff -r 45c0415e45b9 -r 9a218768bac5 hgext3rd/evolve/cmdrewrite.py --- a/hgext3rd/evolve/cmdrewrite.py Tue Jan 22 09:45:25 2019 -0800 +++ b/hgext3rd/evolve/cmdrewrite.py Tue Jan 22 10:32:44 2019 -0800 @@ -1468,7 +1468,8 @@ if pickstate: pickstate.delete() newctx = repo[newnode] if newnode else pctx - obsolete.createmarkers(repo, [(origctx, (newctx,))], operation="pick") + replacements = {origctx.node(): [newctx.node()]} + scmutil.cleanupnodes(repo, replacements, operation="pick") if newnode is None: ui.warn(_("note: picking %d:%s created no changes to commit\n") %