upstream/mercurial-mirror Files · mercurial/thirdparty/cbor/.travis.yml

narrow: allow merging non-conflicting change outside of the narrow spec...

narrow: allow merging non-conflicting change outside of the narrow spec We use the mergestate to carry information about these merge action and reprocess them at commit time to apply the necessary update. The dirstate itself is never affected and remains "pure", with content only in the narrow-spec. This file involved in such merge are therefor not listed in `hg status`. The current testing is based on a modification of the previous testing, that refused to do such merges. As a result it is a bit simple and more extensive code and testing testing will have to be introduced later. I am planning to do this extra testing, soon. In addition, this only works for flat manifest. Support for tree manifest will need more work. I am not currently planning to do this work. Differential Revision: https://phab.mercurial-scm.org/D12119

Pulkit Goyal - - Load All Authors

File last commit:

r37144:4bd73a95 default


                r49565:f1eb77dc

default

Download file

             .travis.yml
        
                    58 lines
            
             | 1.7 KiB
            
                | text/x-yaml
            
             |
                YamlLexer
            
             / mercurial / thirdparty / cbor / .travis.yml
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      language: python

      sudo: false

      stages:

        - name: test

        - name: deploy to pypi

          if: type = push AND tag =~ ^\d+\.\d+\.\d+

      jobs:

        fast_finish: true

        include:

          - env: TOXENV=flake8

          - env: TOXENV=pypy

            python: pypy3

          - env: TOXENV=pypy3

            python: pypy3

          - env: TOXENV=py27

            python: "2.7"

            after_success: &after_success

              - pip install coveralls

              - coveralls

          - env: TOXENV=py33

            python: "3.3"

            after_success: *after_success

          - env: TOXENV=py34

            python: "3.4"

            after_success: *after_success

          - env: TOXENV=py35

            python: "3.5"

            after_success: *after_success

          - env: TOXENV=py36

            python: "3.6"

            after_success: *after_success

          - stage: deploy to pypi

            install: pip install "setuptools >= 36.2.7"

            script: skip

            deploy:

              provider: pypi

              user: agronholm

              password:

                secure: QZ5qoxsrzns/b27adWNzh/OAJp86yRuxTyAFhvas/pbkiALdlT/+PGyhJBnpe+7WBTWnkIXl+YU//voJ0btf6DJcWwgRavMsy22LJJPkvvK+2DHiZ//DbpLbqKWc74y4moce29BCajFTm9JkVwcL2dgN9WuZt+Tay0efcP4sESLxo5lIGdlaQbu+9zVs61Z4Ov+yyEMO/j3LeKshNmUq+84CveQWMiXndXBfJX5TWwjahmUNDp5fMctJxr4fqgL4HCTVQhU79dPc00yDEGS45QkpP8JDrF1DQvU5Ht4COz/Lvzt11pwsAvws2ddclqBUCQsGaWvEWH5rxZTYx/MaMVdTctaUVNoT0wnFUsXXZkomQV0x8vb5RtRLDrKwXosXlSEqnRyiKhdgHGoswHvB7XF5BtQ5RmydRX77pwEGmFd3lqRif2bos0MEeOJA8Xds0TGOKO4PyokBnj/a0tjT2LEVxObmTT6grz5QPXi386AWgxbNl0Lp7cnkSpCqC1hEHVqrDlbtu7uvfGwwe/sYlEcQ07PNCvFoR2GXJawbeHmJRfz+KXjffrt2yCzc671FL1goUysHKdBCppvUInI8FCMQpVWEh5MmQJKB4IpDrhqfo0VS+NNZgZ8lFStq27Pmwqf1HUTGlaDi9VQ0Vo7tW5j4JbD/JvOQSb3j9DjUFps=

              distributions: sdist bdist_wheel

              on:

                tags: true

      install:

        - pip install "setuptools >= 36.2.7"

        - pip install tox

      script: tox

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				language: python
				sudo: false

				stages:
				- name: test
				- name: deploy to pypi
				if: type = push AND tag =~ ^\d+\.\d+\.\d+

				jobs:
				fast_finish: true
				include:
				- env: TOXENV=flake8

				- env: TOXENV=pypy
				python: pypy3

				- env: TOXENV=pypy3
				python: pypy3

				- env: TOXENV=py27
				python: "2.7"
				after_success: &after_success
				- pip install coveralls
				- coveralls

				- env: TOXENV=py33
				python: "3.3"
				after_success: *after_success

				- env: TOXENV=py34
				python: "3.4"
				after_success: *after_success

				- env: TOXENV=py35
				python: "3.5"
				after_success: *after_success

				- env: TOXENV=py36
				python: "3.6"
				after_success: *after_success

				- stage: deploy to pypi
				install: pip install "setuptools >= 36.2.7"
				script: skip
				deploy:
				provider: pypi
				user: agronholm
				password:
				secure: QZ5qoxsrzns/b27adWNzh/OAJp86yRuxTyAFhvas/pbkiALdlT/+PGyhJBnpe+7WBTWnkIXl+YU//voJ0btf6DJcWwgRavMsy22LJJPkvvK+2DHiZ//DbpLbqKWc74y4moce29BCajFTm9JkVwcL2dgN9WuZt+Tay0efcP4sESLxo5lIGdlaQbu+9zVs61Z4Ov+yyEMO/j3LeKshNmUq+84CveQWMiXndXBfJX5TWwjahmUNDp5fMctJxr4fqgL4HCTVQhU79dPc00yDEGS45QkpP8JDrF1DQvU5Ht4COz/Lvzt11pwsAvws2ddclqBUCQsGaWvEWH5rxZTYx/MaMVdTctaUVNoT0wnFUsXXZkomQV0x8vb5RtRLDrKwXosXlSEqnRyiKhdgHGoswHvB7XF5BtQ5RmydRX77pwEGmFd3lqRif2bos0MEeOJA8Xds0TGOKO4PyokBnj/a0tjT2LEVxObmTT6grz5QPXi386AWgxbNl0Lp7cnkSpCqC1hEHVqrDlbtu7uvfGwwe/sYlEcQ07PNCvFoR2GXJawbeHmJRfz+KXjffrt2yCzc671FL1goUysHKdBCppvUInI8FCMQpVWEh5MmQJKB4IpDrhqfo0VS+NNZgZ8lFStq27Pmwqf1HUTGlaDi9VQ0Vo7tW5j4JbD/JvOQSb3j9DjUFps=
				distributions: sdist bdist_wheel
				on:
				tags: true

				install:
				- pip install "setuptools >= 36.2.7"
				- pip install tox

				script: tox