Mercurial > hg-stable
diff tests/test-rebase-collapse.t @ 41195:c339a01acd9a
test: explicit a rebase source in test-rebase-collapse.t
At the time of the rebase, the current revision is `null` so this rebase
should fail. However, a current bug in formatspec makes it pass, we fix rebase
call of the "affected" test to express its actual intent before we fix the
actual bug in a later changeset.
| author | Boris Feld <boris.feld@octobus.net> |
|---|---|
| date | Thu, 10 Jan 2019 15:42:13 +0100 |
| parents | 4edd427f34c1 |
| children | 71fee4564410 |
line wrap: on
line diff
--- a/tests/test-rebase-collapse.t Fri Jan 11 13:12:19 2019 -0800 +++ b/tests/test-rebase-collapse.t Thu Jan 10 15:42:13 2019 +0100 @@ -34,7 +34,7 @@ > echo "====" > echo "edited manually" >> \$1 > EOF - $ HGEDITOR="sh $TESTTMP/editor.sh" hg rebase --collapse --keepbranches -e --dest F + $ HGEDITOR="sh $TESTTMP/editor.sh" hg rebase --collapse --keepbranches -e --source B --dest F rebasing 1:112478962961 "B" (B) rebasing 3:26805aba1e60 "C" (C) rebasing 5:f585351a92f8 "D" (D tip)