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