phillco updated this revision to Diff 4648. REPOSITORY rHG Mercurial
CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D1782?vs=4647&id=4648 REVISION DETAIL https://phab.mercurial-scm.org/D1782 AFFECTED FILES hgext/rebase.py CHANGE DETAILS diff --git a/hgext/rebase.py b/hgext/rebase.py --- a/hgext/rebase.py +++ b/hgext/rebase.py @@ -779,8 +779,11 @@ """ inmemory = ui.configbool('rebase', 'experimental.inmemory') - if opts.get('continue') or opts.get('abort'): + if (opts.get('continue') or opts.get('abort') or + repo.currenttransaction() is not None): # in-memory rebase is not compatible with resuming rebases. + # (Or if it is run within a transaction, since the restart logic can + # fail the entire transaction.) inmemory = False if inmemory: To: phillco, #hg-reviewers, quark Cc: quark, mercurial-devel, sid0 _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
