##// END OF EJS Templates
fix: use obsolete.isenabled() to check for experimental.allowdivergence...
av6 -
r48578:82c87566 default
parent child Browse files
Show More
@@ -147,6 +147,7 b' from mercurial import ('
147 147 mdiff,
148 148 merge,
149 149 mergestate as mergestatemod,
150 obsolete,
150 151 pycompat,
151 152 registrar,
152 153 rewriteutil,
@@ -451,10 +452,7 b' def checkfixablectx(ui, repo, ctx):'
451 452 """Aborts if the revision shouldn't be replaced with a fixed one."""
452 453 if ctx.obsolete():
453 454 # It would be better to actually check if the revision has a successor.
454 allowdivergence = ui.configbool(
455 b'experimental', b'evolution.allowdivergence'
456 )
457 if not allowdivergence:
455 if not obsolete.isenabled(repo, obsolete.allowdivergenceopt):
458 456 raise error.Abort(
459 457 b'fixing obsolete revision could cause divergence'
460 458 )
General Comments 0
You need to be logged in to leave comments. Login now