# HG changeset patch # User Pierre-Yves David # Date 1457740079 0 # Node ID 05d15886aaebcee15a372fc28584766e4e7553bd # Parent ce268aebd0f595113efff5bf185ffc19a959c252 test: explicitly disable rebaseskipobsolete in a couple of place (issue5135) We want to keep the old behavior for the sake of testing. diff -r ce268aebd0f5 -r 05d15886aaeb tests/test-inhibit.t --- a/tests/test-inhibit.t Fri Mar 11 13:11:54 2016 +0100 +++ b/tests/test-inhibit.t Fri Mar 11 23:47:59 2016 +0000 @@ -419,7 +419,7 @@ abort: hidden revision '3'! (use --hidden to access hidden revisions) [255] - $ hg rebase -r ad78ff7d621f -r 53a94305e133 -d 2db36d8066ff + $ hg rebase -r ad78ff7d621f -r 53a94305e133 -d 2db36d8066ff --config experimental.rebaseskipobsolete=0 Warning: accessing hidden changesets 2db36d8066ff for write operation Warning: accessing hidden changesets ad78ff7d621f,53a94305e133 for write operation rebasing 10:ad78ff7d621f "add cK" diff -r ce268aebd0f5 -r 05d15886aaeb tests/test-obsolete.t --- a/tests/test-obsolete.t Fri Mar 11 13:11:54 2016 +0100 +++ b/tests/test-obsolete.t Fri Mar 11 23:47:59 2016 +0000 @@ -509,7 +509,7 @@ should not rebase extinct changesets #excluded 'whole rebase set is extinct and ignored.' message not in core - $ hg rebase -b '3' -d 4 --traceback + $ hg rebase -b '3' -d 4 --traceback --config experimental.rebaseskipobsolete=0 rebasing 3:0d3f46688ccc "add obsol_c" rebasing 8:159dfc9fa5d3 "add obsol_d''" (tip) 2 new divergent changesets