Mercurial > evolve
changeset 6899:43b1fcb4055c mercurial-6.7
test-compat: merge mercurial-6.8 into mercurial-6.7
| author | Anton Shestakov <av6@dwimlabs.net> |
|---|---|
| date | Thu, 24 Oct 2024 17:57:11 +0400 |
| parents | f46913e52954 (diff) 95817be66c0d (current diff) |
| children | 1c7dcb1db06d |
| files | .gitlab-ci.yml |
| diffstat | 3 files changed, 2 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/.gitlab-ci.yml Thu Oct 24 17:54:46 2024 +0400 +++ b/.gitlab-ci.yml Thu Oct 24 17:57:11 2024 +0400 @@ -25,8 +25,8 @@ - (cd tests; ls -1 test-check-*.t > /tmp/check-tests.txt) script: - *prepare_hg - - ($PYTHON --version) - - (cd tests; set -x; HGMODULEPOLICY="$TEST_HGMODULEPOLICY" $PYTHON /ci/repos/mercurial/tests/run-tests.py --color=always $RUNTEST_ARGS) + - ("$PYTHON" --version) + - (cd tests; set -x; HGMODULEPOLICY="$TEST_HGMODULEPOLICY" "$PYTHON" /ci/repos/mercurial/tests/run-tests.py --color=always $RUNTEST_ARGS) checks-py3: <<: *runtests
--- a/tests/test-evolve-interrupted.t Thu Oct 24 17:54:46 2024 +0400 +++ b/tests/test-evolve-interrupted.t Thu Oct 24 17:57:11 2024 +0400 @@ -45,8 +45,6 @@ $ hg evolve --update --config hooks.precommit=false --config ui.merge=:other move:[1] banana atop:[2] apricot and blueberry - transaction abort! (no-hg64 !) - rollback completed (no-hg64 !) abort: precommit hook exited with status 1 [40] $ hg l @@ -104,8 +102,6 @@ $ hg evolve --update --config hooks.precommit=false --config ui.merge=:other move:[1] banana atop:[2] apricot and blueberry - transaction abort! (no-hg64 !) - rollback completed (no-hg64 !) abort: precommit hook exited with status 1 [40] $ cat b @@ -129,8 +125,6 @@ $ hg evolve --update --config hooks.precommit=false --config ui.merge=:other move:[1] banana atop:[2] apricot and blueberry - transaction abort! (no-hg64 !) - rollback completed (no-hg64 !) abort: precommit hook exited with status 1 [40] $ hg evolve --continue
--- a/tests/test-topic-flow-publish-flag.t Thu Oct 24 17:54:46 2024 +0400 +++ b/tests/test-topic-flow-publish-flag.t Thu Oct 24 17:57:11 2024 +0400 @@ -439,12 +439,9 @@ $ cd $TESTTMP/bare-client/.hg/cache/ $ grep double branch2* | sort - branch2-base:* o double//slash (glob) (hg68 !) branch2-immutable:* o double//slash (glob) - branch2-served:* o double//slash (glob) (hg68 !) $ cd $TESTTMP/bare-branch-server/.hg/cache/ $ grep double branch2* | sort branch2-base:* o double//slash (glob) branch2-immutable:* o double//slash (glob) - branch2-served:* o double//slash (glob) (hg68 !)