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