Mercurial > public > mercurial-scm > hg-stable
diff hgext/rebase.py @ 40453:6f679f25fd4d stable
rebase: abort in-mem rebase if there's a dirty merge state
In-memory merge uses the on-disk merge state, so we should not allow
it run in-memory merge when the merge state is not clean. We should
probably not use the on-disk merge state when running in-memory merge,
but chaning that is not suitable for the stable branch.
Differential Revision: https://phab.mercurial-scm.org/D5357
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 03 Dec 2018 09:36:40 -0800 |
| parents | f07d4f94f098 |
| children | cb372d09d30a |
line wrap: on
line diff
--- a/hgext/rebase.py Fri Nov 30 16:21:37 2018 -0800 +++ b/hgext/rebase.py Mon Dec 03 09:36:40 2018 -0800 @@ -540,7 +540,7 @@ p1, p2, base = defineparents(repo, rev, self.destmap, self.state, self.skipped, self.obsoletenotrebased) - if len(repo[None].parents()) == 2: + if not self.inmemory and len(repo[None].parents()) == 2: repo.ui.debug('resuming interrupted rebase\n') else: overrides = {('ui', 'forcemerge'): opts.get('tool', '')}