Mercurial > evolve
view .gitlab-ci.yml @ 4935:3874bc10d4a7 stable
docs: add two more amend commits to simulate temporary amend commits
sharing.rst made reference to temporary amend commits and used them to
demonstrate that hidden commits are not exchanged. Nowadays, evolve doesn't
create such commits, but it still makes sense to show how they are handled
during the exchange process. So let's add two more amend commits, one for each
repo. This way the guide doesn't have to be updated too much, but doesn't lose
this important detail of working with evolve.
Unfortunately, this means that tons of hashes change, but it's better than to
have figure 4 demonstrate absolutely nothing.
Temporary amend commits were removed from test-sharing.t in 06844693bb21,
but sharing.rst continued using them for demonstration purposes. It might've
been better to replace at least some of the temporary amend commits by extra
amends back then, but oh well.
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Mon, 11 Nov 2019 02:42:37 +0700 |
parents | 0fad1d376814 |
children | 8ced373682c4 |
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: - echo $PWD - rm -rf /tmp/mercurial-clone-`hg log -r . -T "{node}"` - hg clone https://mirror.octobus.net/hg/ /tmp/mercurial-clone-`hg log -r . -T "{node}"` --config share.pool=/tmp/ - hg -R /tmp/mercurial-clone-`hg log -r . -T "{node}"` update `hg log -r . -T '{branch}'` - (cd tests; /tmp/mercurial-clone-`hg log -r . -T "{node}"`/tests/run-tests.py) - rm -rf /tmp/mercurial-clone-`hg log -r . -T "{node}"` tests-py2-pure: image: octobus/ci-py2-hgext3rd script: - echo $PWD - rm -rf /tmp/mercurial-clone-`hg log -r . -T "{node}"` - hg clone https://mirror.octobus.net/hg/ /tmp/mercurial-clone-`hg log -r . -T "{node}"` --config share.pool=/tmp/ - hg -R /tmp/mercurial-clone-`hg log -r . -T "{node}"` update `hg log -r . -T '{branch}'` - (cd tests; /tmp/mercurial-clone-`hg log -r . -T "{node}"`/tests/run-tests.py --pure) - rm -rf /tmp/mercurial-clone-`hg log -r . -T "{node}"` tests-py3-cext: image: octobus/ci-py3-hgext3rd script: - echo $PWD - rm -rf /tmp/mercurial-clone-`hg log -r . -T "{node}"` - hg clone https://mirror.octobus.net/hg/ /tmp/mercurial-clone-`hg log -r . -T "{node}"` --config share.pool=/tmp/ - hg -R /tmp/mercurial-clone-`hg log -r . -T "{node}"` update `hg log -r . -T '{branch}'` - (cd tests; python3 /tmp/mercurial-clone-`hg log -r . -T "{node}"`/tests/run-tests.py) - rm -rf /tmp/mercurial-clone-`hg log -r . -T "{node}"` tests-py3-pure: image: octobus/ci-py3-hgext3rd script: - echo $PWD - rm -rf /tmp/mercurial-clone-`hg log -r . -T "{node}"` - hg clone https://mirror.octobus.net/hg/ /tmp/mercurial-clone-`hg log -r . -T "{node}"` --config share.pool=/tmp/ - hg -R /tmp/mercurial-clone-`hg log -r . -T "{node}"` update `hg log -r . -T '{branch}'` - (cd tests; python3 /tmp/mercurial-clone-`hg log -r . -T "{node}"`/tests/run-tests.py --pure) - rm -rf /tmp/mercurial-clone-`hg log -r . -T "{node}"`