Patchwork [1,of,8] test: explicit a rebase source in test-rebase-collapse.t

login
register
mail settings
Submitter Boris Feld
Date Jan. 11, 2019, 11:29 a.m.
Message ID <348c85f511e3afa0a389.1547206143@Laptop-Boris.lan>
Download mbox | patch
Permalink /patch/37658/
State Accepted
Headers show

Comments

Boris Feld - Jan. 11, 2019, 11:29 a.m.
# HG changeset patch
# User Boris Feld <boris.feld@octobus.net>
# Date 1547131333 -3600
#      Thu Jan 10 15:42:13 2019 +0100
# Node ID 348c85f511e3afa0a38943581790cd5dae308d21
# Parent  963462786f6e028563bcedc9008622e0f3b59c86
# EXP-Topic revs-efficiency
# Available At https://bitbucket.org/octobus/mercurial-devel/
#              hg pull https://bitbucket.org/octobus/mercurial-devel/ -r 348c85f511e3
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.
Yuya Nishihara - Jan. 12, 2019, 3:52 a.m.
On Fri, 11 Jan 2019 12:29:03 +0100, Boris Feld wrote:
> # HG changeset patch
> # User Boris Feld <boris.feld@octobus.net>
> # Date 1547131333 -3600
> #      Thu Jan 10 15:42:13 2019 +0100
> # Node ID 348c85f511e3afa0a38943581790cd5dae308d21
> # Parent  963462786f6e028563bcedc9008622e0f3b59c86
> # EXP-Topic revs-efficiency
> # Available At https://bitbucket.org/octobus/mercurial-devel/
> #              hg pull https://bitbucket.org/octobus/mercurial-devel/ -r 348c85f511e3
> test: explicit a rebase source in test-rebase-collapse.t

Queued this, thanks.

Patch

diff --git a/tests/test-rebase-collapse.t b/tests/test-rebase-collapse.t
--- a/tests/test-rebase-collapse.t
+++ b/tests/test-rebase-collapse.t
@@ -34,7 +34,7 @@  Highest phase of source commits is used:
   > 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)