Mercurial > evolve
view .gitlab-ci.yml @ 5015:43f4784a3f21
evolve: add test for `--continue` case when relocating "divergent"
This test shows that for now we don't handle the continue case when
relocating "divergent" cset hit merge conflict while resolving
content-divergence.
Next patch will be adding the support for --continue case.
author | Sushil khanchi <sushilkhanchi97@gmail.com> |
---|---|
date | Mon, 25 Nov 2019 21:28:52 +0530 |
parents | 1214f3d085a9 |
children | 43b448bb1a57 |
line wrap: on
line source
flake8: image: octobus/ci-py2-hgext3rd script: - hg files -0 'set:(**.py or grep("^#!.*python")) - removed()' -X hgext3rd/evolve/thirdparty | xargs -0 flake8 tests-py2-cext: image: octobus/ci-py2-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; /ci/repos/mercurial/tests/run-tests.py --color=always) tests-py2-pure: image: octobus/ci-py2-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; /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) doc: image: octobus/ci-py2-evolve-doc script: - cd docs/ - make variables: LANG: en_us.UTF-8 artifacts: paths: - html/*