Mercurial > evolve
changeset 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 | ce268aebd0f5 |
| children | 47a0ce11b4ca |
| files | tests/test-inhibit.t tests/test-obsolete.t |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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"
--- 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