862 with ui.configoverride(overrides, 'rebase'): |
862 with ui.configoverride(overrides, 'rebase'): |
863 return _dorebase(ui, repo, action, opts, inmemory=inmemory) |
863 return _dorebase(ui, repo, action, opts, inmemory=inmemory) |
864 except error.InMemoryMergeConflictsError: |
864 except error.InMemoryMergeConflictsError: |
865 ui.warn(_('hit merge conflicts; re-running rebase without in-memory' |
865 ui.warn(_('hit merge conflicts; re-running rebase without in-memory' |
866 ' merge\n')) |
866 ' merge\n')) |
867 _dorebase(ui, repo, action='abort') |
867 _dorebase(ui, repo, 'abort', opts) |
868 return _dorebase(ui, repo, action, opts, inmemory=False) |
868 return _dorebase(ui, repo, action, opts, inmemory=False) |
869 else: |
869 else: |
870 return _dorebase(ui, repo, action, opts) |
870 return _dorebase(ui, repo, action, opts) |
871 |
871 |
872 def _dryrunrebase(ui, repo, action, opts): |
872 def _dryrunrebase(ui, repo, action, opts): |