diff --git a/hgext/rebase.py b/hgext/rebase.py --- a/hgext/rebase.py +++ b/hgext/rebase.py @@ -352,8 +352,6 @@ """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()} ( self.obsolete_with_successor_in_destination, diff --git a/mercurial/configitems.py b/mercurial/configitems.py --- a/mercurial/configitems.py +++ b/mercurial/configitems.py @@ -2658,11 +2658,6 @@ default=False, ) coreconfigitem( - b'experimental', - b'rebaseskipobsolete', - default=True, -) -coreconfigitem( b'rebase', b'singletransaction', default=False, diff --git a/relnotes/next b/relnotes/next --- a/relnotes/next +++ b/relnotes/next @@ -33,6 +33,10 @@ change the output of `hg log` when explicitly asking for first or second parent. + * The `experimental.rebaseskipobsolete` config was removed. Obsolete + commits continue to be skipped as they have been for many + years. + == Internal API Changes == diff --git a/tests/test-rebase-obsolete2.t b/tests/test-rebase-obsolete2.t --- a/tests/test-rebase-obsolete2.t +++ b/tests/test-rebase-obsolete2.t @@ -26,8 +26,6 @@ $ hg init obsskip $ cd obsskip $ cat << EOF >> .hg/hgrc - > [experimental] - > rebaseskipobsolete = True > [extensions] > strip = > EOF diff --git a/tests/test-rebase-obsolete3.t b/tests/test-rebase-obsolete3.t --- a/tests/test-rebase-obsolete3.t +++ b/tests/test-rebase-obsolete3.t @@ -156,17 +156,6 @@ |/ o 0:b173517d0057 a - $ hg strip -r 8: - -(Not skipping obsoletes means that divergence is allowed.) - - $ hg rebase --config experimental.rebaseskipobsolete=false -r 'c'::'f' -d 'x' - rebasing 3:a82ac2b38757 c "c" - rebasing 4:76be324c128b d "d" - rebasing 7:1143e9adc121 f tip "f" - 1 new orphan changesets - 2 new content-divergent changesets - $ hg strip -r 0: Similar test on a more complex graph