Mercurial > public > mercurial-scm > hg-stable
diff hgext/rebase.py @ 46863:d9601243b73c
rebase: when using --keep, don't care about pruned commits or divergence
`hg rebase --keep` creates duplicate commits (not successors), so I
was surprised that it still skips pruned commits and errors out if it
"would cause divergence" (it wouldn't). I guess this was just an
oversight. We didn't have any tests for it, so I also included that.
Differential Revision: https://phab.mercurial-scm.org/D10269
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 25 Mar 2021 11:35:16 -0700 |
| parents | 82b17bfc13eb |
| children | ba6881c6a178 |
line wrap: on
line diff
--- a/hgext/rebase.py Thu Mar 25 08:38:16 2021 -0700 +++ b/hgext/rebase.py Thu Mar 25 11:35:16 2021 -0700 @@ -350,6 +350,8 @@ def _handleskippingobsolete(self): """Compute structures necessary for skipping obsolete revisions""" + if self.keepf: + return if not self.ui.configbool(b'experimental', b'rebaseskipobsolete'): return obsoleteset = {r for r in self.state if self.repo[r].obsolete()}