Mercurial > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
41194:4c5864dad8b0 | 41195:c339a01acd9a |
---|---|
32 > echo "==== before editing" | 32 > echo "==== before editing" |
33 > cat \$1 | 33 > cat \$1 |
34 > echo "====" | 34 > echo "====" |
35 > echo "edited manually" >> \$1 | 35 > echo "edited manually" >> \$1 |
36 > EOF | 36 > EOF |
37 $ HGEDITOR="sh $TESTTMP/editor.sh" hg rebase --collapse --keepbranches -e --dest F | 37 $ HGEDITOR="sh $TESTTMP/editor.sh" hg rebase --collapse --keepbranches -e --source B --dest F |
38 rebasing 1:112478962961 "B" (B) | 38 rebasing 1:112478962961 "B" (B) |
39 rebasing 3:26805aba1e60 "C" (C) | 39 rebasing 3:26805aba1e60 "C" (C) |
40 rebasing 5:f585351a92f8 "D" (D tip) | 40 rebasing 5:f585351a92f8 "D" (D tip) |
41 ==== before editing | 41 ==== before editing |
42 Collapsed revision | 42 Collapsed revision |