# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1575294152 -3600
# Node ID 6bc70f78724ca51de7bf766cd5a6dfcd7ae3c15c
# Parent  12ad2ec5e8a4c394692f0580b881086b68ec0137# Parent  3bcdaf298c7a88bcb46241e011eeae630f8ae672
test-compat: merge mercurial-5.0 into mercurial-4.9

diff -r 12ad2ec5e8a4 -r 6bc70f78724c .gitlab-ci.yml
--- a/.gitlab-ci.yml	Thu Nov 28 10:50:55 2019 +0100
+++ b/.gitlab-ci.yml	Mon Dec 02 14:42:32 2019 +0100
@@ -18,19 +18,3 @@
         - hg_rev=$(tests/testlib/map-hg-rev.sh "$(hg log -r . -T '{branch}')")
         - hg -R /ci/repos/mercurial/ update "$hg_rev"
         - (cd tests; /ci/repos/mercurial/tests/run-tests.py --color=always --pure)
-
-tests-py3-cext:
-    image: octobus/ci-py3-hgext3rd
-    script:
-        - hg pull -R /ci/repos/mercurial/
-        - hg_rev=$(tests/testlib/map-hg-rev.sh "$(hg log -r . -T '{branch}')")
-        - hg -R /ci/repos/mercurial/ update "$hg_rev"
-        - (cd tests; python3 /ci/repos/mercurial/tests/run-tests.py --color=always)
-
-tests-py3-pure:
-    image: octobus/ci-py3-hgext3rd
-    script:
-        - hg pull -R /ci/repos/mercurial/
-        - hg_rev=$(tests/testlib/map-hg-rev.sh "$(hg log -r . -T '{branch}')")
-        - hg -R /ci/repos/mercurial/ update "$hg_rev"
-        - (cd tests; python3 /ci/repos/mercurial/tests/run-tests.py --color=always --pure)