--- a/hgext3rd/evolve/cmdrewrite.py Thu Jul 04 16:55:57 2019 +0200
+++ b/hgext3rd/evolve/cmdrewrite.py Fri Jun 14 22:46:58 2019 +0530
@@ -1355,10 +1355,8 @@
rewriteutil.precheck(repo, revs, 'touch')
tmpl = utility.shorttemplate
displayer = compat.changesetdisplayer(ui, repo, {'template': tmpl})
- with repo.wlock(), repo.lock():
- tr = repo.transaction('touch')
- with util.acceptintervention(tr):
- touchnodes(ui, repo, revs, displayer, **opts)
+ with repo.wlock(), repo.lock(), repo.transaction('touch'):
+ touchnodes(ui, repo, revs, displayer, **opts)
def touchnodes(ui, repo, revs, displayer, **opts):
duplicate = opts['duplicate']