diff tests/test-obsolete.t @ 1621:05d15886aaeb

test: explicitly disable rebaseskipobsolete in a couple of place (issue5135) We want to keep the old behavior for the sake of testing.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Fri, 11 Mar 2016 23:47:59 +0000
parents c216b175d535
children 898dfca94433 f4047fba5e90
line wrap: on
line diff
--- 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