--- a/hgext3rd/evolve/evolvecmd.py	Mon Mar 12 15:50:25 2018 -0700
+++ b/hgext3rd/evolve/evolvecmd.py	Mon Mar 12 15:40:28 2018 -0700
@@ -235,7 +235,8 @@
             tmpid = relocate(repo, bumped, prec.p1())
             if tmpid is not None:
                 tmpctx = repo[tmpid]
-                compat.createmarkers(repo, [(bumped, (tmpctx,))])
+                compat.createmarkers(repo, [(bumped, (tmpctx,))],
+                                     operation='evolve')
         except MergeFailure:
             repo.vfs.write('graftstate', bumped.hex() + '\n')
             repo.ui.write_err(_('evolution failed!\n'))
@@ -280,12 +281,12 @@
 
         newid = repo.commitctx(new)
     if newid is None:
-        compat.createmarkers(repo, [(tmpctx, ())])
+        compat.createmarkers(repo, [(tmpctx, ())], operation='evolve')
         newid = prec.node()
     else:
         phases.retractboundary(repo, tr, bumped.phase(), [newid])
         compat.createmarkers(repo, [(tmpctx, (repo[newid],))],
-                             flag=obsolete.bumpedfix)
+                             flag=obsolete.bumpedfix, operation='evolve')
     bmupdate(newid)
     repo.ui.status(_('committed as %s\n') % node.short(newid))
     # reroute the working copy parent to the new changeset
@@ -408,7 +409,7 @@
             # no changes
         else:
             new = repo['.']
-        compat.createmarkers(repo, [(other, (new,))])
+        compat.createmarkers(repo, [(other, (new,))], operation='evolve')
         phases.retractboundary(repo, tr, other.phase(), [new.node()])
         return (True, new.node())
     finally:
@@ -546,11 +547,12 @@
     bmchanges = []
 
     if nodenew is not None:
-        compat.createmarkers(repo, [(repo[nodesrc], (repo[nodenew],))])
+        compat.createmarkers(repo, [(repo[nodesrc], (repo[nodenew],))],
+                             operation='evolve')
         for book in oldbookmarks:
             bmchanges.append((book, nodenew))
     else:
-        compat.createmarkers(repo, [(repo[nodesrc], ())])
+        compat.createmarkers(repo, [(repo[nodesrc], ())], operation='evolve')
         # Behave like rebase, move bookmarks to dest
         for book in oldbookmarks:
             bmchanges.append((book, dest.node()))
@@ -1221,10 +1223,8 @@
 
         # resolving conflicts can lead to empty wdir and node can be None in
         # those cases
-        if node is not None:
-            compat.createmarkers(repo, [(ctx, (repo[node],))])
-        else:
-            compat.createmarkers(repo, [(ctx, (repo['.'],))])
+        newctx = repo[node] if node is not None else repo['.']
+        compat.createmarkers(repo, [(ctx, (newctx,))], operation='evolve')
 
         # make sure we are continuing evolve and not `hg next --evolve`
         if evolvestate['command'] == 'evolve':