hgext3rd/evolve/evolvecmd.py
changeset 5343 ebfd0d875600
parent 5341 13376ca93fa3
child 5345 a73cdef2e33f
--- a/hgext3rd/evolve/evolvecmd.py	Mon Dec 09 10:05:24 2019 -0800
+++ b/hgext3rd/evolve/evolvecmd.py	Mon Dec 09 11:09:11 2019 -0800
@@ -446,7 +446,10 @@
 
 def _relocatedivergent(repo, orig, dest, evolvestate):
     """relocates a divergent commit and saves the evolve state"""
-    with state.saver(evolvestate, {b'current': orig.node()}):
+    configoverride = repo.ui.configoverride(
+        {(b'ui', b'allowemptycommit'): b'true'}, b'evolve'
+    )
+    with state.saver(evolvestate, {b'current': orig.node()}), configoverride:
         return _relocate(repo, orig, dest, evolvestate, keepbranch=True)
 
 def _solvedivergent(ui, repo, divergent, evolvestate, displayer, dryrun=False,