--- a/hgext/histedit.py Fri Sep 05 11:34:29 2014 -0700
+++ b/hgext/histedit.py Fri Sep 05 11:36:20 2014 -0700
@@ -221,6 +221,7 @@
cmdutil.revert(ui, repo, ctx, (wcpar, node.nullid), all=True)
stats = None
else:
+ repo.dirstate.beginparentchange()
try:
# ui.forcemerge is an internal variable, do not document
repo.ui.setconfig('ui', 'forcemerge', opts.get('tool', ''),
@@ -230,6 +231,7 @@
finally:
repo.ui.setconfig('ui', 'forcemerge', '', 'histedit')
repo.setparents(wcpar, node.nullid)
+ repo.dirstate.endparentchange()
repo.dirstate.write()
# fix up dirstate for copies and renames
cmdutil.duplicatecopies(repo, ctx.rev(), ctx.p1().rev())