444 |
444 |
445 return (True, divergent, other, resolutionparent, relocatereq) |
445 return (True, divergent, other, resolutionparent, relocatereq) |
446 |
446 |
447 def _relocatedivergent(repo, orig, dest, evolvestate): |
447 def _relocatedivergent(repo, orig, dest, evolvestate): |
448 """relocates a divergent commit and saves the evolve state""" |
448 """relocates a divergent commit and saves the evolve state""" |
449 with state.saver(evolvestate, {b'current': orig.node()}): |
449 configoverride = repo.ui.configoverride( |
|
450 {(b'ui', b'allowemptycommit'): b'true'}, b'evolve' |
|
451 ) |
|
452 with state.saver(evolvestate, {b'current': orig.node()}), configoverride: |
450 return _relocate(repo, orig, dest, evolvestate, keepbranch=True) |
453 return _relocate(repo, orig, dest, evolvestate, keepbranch=True) |
451 |
454 |
452 def _solvedivergent(ui, repo, divergent, evolvestate, displayer, dryrun=False, |
455 def _solvedivergent(ui, repo, divergent, evolvestate, displayer, dryrun=False, |
453 confirm=False, progresscb=None): |
456 confirm=False, progresscb=None): |
454 """tries to solve content-divergence of a changeset |
457 """tries to solve content-divergence of a changeset |