Submitter | phabricator |
---|---|
Date | July 10, 2020, 10:50 a.m. |
Message ID | <differential-rev-PHID-DREV-cfrttvhjpji3rlst2y5j-req@mercurial-scm.org> |
Download | mbox | patch |
Permalink | /patch/46688/ |
State | Superseded |
Headers | show |
Comments
Patch
diff --git a/hgext/rebase.py b/hgext/rebase.py --- a/hgext/rebase.py +++ b/hgext/rebase.py @@ -529,11 +529,8 @@ extra = {b'rebase_source': ctx.hex()} for c in self.extrafns: c(ctx, extra) - keepbranch = self.keepbranchesf and repo[p1].branch() != ctx.branch() destphase = max(ctx.phase(), phases.draft) overrides = {(b'phases', b'new-commit'): destphase} - if keepbranch: - overrides[(b'ui', b'allowemptycommit')] = True with repo.ui.configoverride(overrides, b'rebase'): if self.inmemory: newnode = commitmemorynode(