Mercurial > evolve
view .gitlab-ci.yml @ 5010:effce0a1f5bd
tests: demonstrate how evolve loses transitive copies when interrupted
Let's say `b` has been renamed to `c` in commit A and then renamed
to `d` in commit B. We now modify A in a way that will cause a
conflict when we evolve B. `hg evolve` will now stop and let the user
resolve the conflicts, but it will have lost the copy information in
the working copy (should still be c->d).
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Tue, 19 Nov 2019 14:24:31 -0800 |
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/*