--- a/hgext/evolve.py Tue Nov 17 20:25:15 2015 -0800
+++ b/hgext/evolve.py Tue Nov 17 17:06:07 2015 -0800
@@ -2008,8 +2008,10 @@
/!\ * hg kill -n Y W Z
""")
if progresscb: progresscb()
+ emtpycommitallowed = repo.ui.backupconfig('ui', 'allowemptycommit')
tr = repo.transaction('stabilize-divergent')
try:
+ repo.ui.setconfig('ui', 'allowemptycommit', True)
repo.dirstate.beginparentchange()
repo.dirstate.setparents(divergent.node(), node.nullid)
repo.dirstate.endparentchange()
@@ -2024,6 +2026,7 @@
phases.retractboundary(repo, tr, other.phase(), [new.node()])
tr.close()
finally:
+ repo.ui.restoreconfig(emtpycommitallowed)
tr.release()
def divergentdata(ctx):