upstream/mercurial-mirror Files · mercurial/thirdparty/cbor/cbor2/__init__.py

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

             __init__.py
        
                    3 lines
            
             | 224 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / thirdparty / cbor / cbor2 / __init__.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      from .decoder import load, loads, CBORDecoder, CBORDecodeError  # noqa

      from .encoder import dump, dumps, CBOREncoder, CBOREncodeError, shareable_encoder  # noqa

      from .types import CBORTag, CBORSimpleValue, undefined  # noqa

	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

				from .decoder import load, loads, CBORDecoder, CBORDecodeError # noqa
				from .encoder import dump, dumps, CBOREncoder, CBOREncodeError, shareable_encoder # noqa
				from .types import CBORTag, CBORSimpleValue, undefined # noqa