hgext3rd/evolve/cmdrewrite.py
changeset 5136 bbf33d5f32ef
parent 5135 731b5a89a784
child 5178 61e49d2654cc
child 5213 d5544ebf5836
--- a/hgext3rd/evolve/cmdrewrite.py	Tue Feb 04 16:22:40 2020 -0800
+++ b/hgext3rd/evolve/cmdrewrite.py	Tue Feb 04 16:22:40 2020 -0800
@@ -1389,8 +1389,11 @@
 
     duplicate = opts['duplicate']
     if not duplicate:
-        # allowdivergence=True because we'll do our own checking later instead
-        rewriteutil.precheck(repo, revs, b'touch', allowdivergence=True)
+        # Override allowdivergence=true because we'll do our own checking later
+        # instead
+        overrides = {(b'experimental', b'evolution.allowdivergence'): b"true"}
+        with ui.configoverride(overrides, b'touch'):
+            rewriteutil.precheck(repo, revs, b'touch')
     tmpl = utility.shorttemplate
     displayer = compat.changesetdisplayer(ui, repo, {b'template': tmpl})
     with repo.wlock(), repo.lock(), repo.transaction(b'touch'):