Mercurial > hg
changeset 33563:da94a99df96b
test-phases-exchange: properly conditionalize output
I forgot to invert the conditions, and the test runner didn't catch it[1]. But
since only '&&' is supported in the per-line feature tests, this won't work
anyway.
[1] https://www.mercurial-scm.org/pipermail/mercurial-devel/2017-July/101941.html
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Tue, 18 Jul 2017 08:14:10 -0400 |
| parents | 3cfabb6cfd51 |
| children | 91e3dcefc9b7 |
| files | tests/test-phases-exchange.t |
| diffstat | 1 files changed, 9 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-phases-exchange.t Tue Jul 18 00:10:44 2017 +0530 +++ b/tests/test-phases-exchange.t Tue Jul 18 08:14:10 2017 -0400 @@ -1302,12 +1302,17 @@ does. The conditional output accounts for changes in the conditional block above. +#if unix-permissions no-root + $ hg -R Upsilon phase -q --force --draft 2 + test-debug-phase: move rev 2: 0 -> 1 +#else $ hg -R Upsilon phase -q --force --draft 2 test-debug-phase: move rev 2: 0 -> 1 - test-debug-phase: move rev 3: 0 -> 1 (unix-permissions no-root !) - test-debug-phase: move rev 7: 0 -> 1 (unix-permissions no-root !) - test-debug-phase: move rev 8: 0 -> 1 (unix-permissions no-root !) - test-debug-phase: move rev 9: 0 -> 1 (unix-permissions no-root !) + test-debug-phase: move rev 3: 0 -> 1 + test-debug-phase: move rev 7: 0 -> 1 + test-debug-phase: move rev 8: 0 -> 1 + test-debug-phase: move rev 9: 0 -> 1 +#endif $ hg clone -q Upsilon Pi -r 7 test-debug-phase: new rev 0: x -> 0