hgext3rd/evolve/cmdrewrite.py
changeset 4050 3dddb03f3559
parent 4049 25981fae92f9
child 4051 ddae36b4031e
--- a/hgext3rd/evolve/cmdrewrite.py	Fri Aug 31 09:13:11 2018 +0200
+++ b/hgext3rd/evolve/cmdrewrite.py	Fri Aug 31 12:45:56 2018 +0200
@@ -1336,7 +1336,7 @@
     if opts.get('rev'):
         revs.append(opts['rev'])
 
-    with repo.wlock(), repo.lock(), repo.transaction('grab'):
+    with repo.wlock(), repo.lock(), repo.transaction('pick'):
         grabstate = state.cmdstate(repo, path='grabstate')
         pctx = repo['.']
 
@@ -1389,7 +1389,7 @@
             origctx = repo[orignode]
 
         overrides = {('phases', 'new-commit'): origctx.phase()}
-        with repo.ui.configoverride(overrides, 'grab'):
+        with repo.ui.configoverride(overrides, 'pick'):
             newnode = repo.commit(text=origctx.description(),
                                   user=origctx.user(),
                                   date=origctx.date(), extra=origctx.extra())