Mercurial > hg
view mercurial/thirdparty/attr/__init__.py @ 42151:7116fc614cfc
tests: make merge conflicts explicit in `hg annotate` tests
We were using `true` as merge tool. I think it makes the test easier
to understand if we make the conflicts explcit. It also papered over a
conflict that shouldn't have been a conflict (just a bug in copy
tracing). I've marked that "BROKEN".
Differential Revision: https://phab.mercurial-scm.org/D6252
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Sun, 14 Apr 2019 13:46:40 -0700 |
parents | 765eb17a7eb8 |
children | e1c586b9a43c |
line wrap: on
line source
from __future__ import absolute_import, division, print_function from ._funcs import ( asdict, assoc, astuple, evolve, has, ) from ._make import ( Attribute, Factory, NOTHING, attr, attributes, fields, make_class, validate, ) from ._config import ( get_run_validators, set_run_validators, ) from . import exceptions from . import filters from . import converters from . import validators __version__ = "17.2.0" __title__ = "attrs" __description__ = "Classes Without Boilerplate" __uri__ = "http://www.attrs.org/" __doc__ = __description__ + " <" + __uri__ + ">" __author__ = "Hynek Schlawack" __email__ = "hs@ox.cx" __license__ = "MIT" __copyright__ = "Copyright (c) 2015 Hynek Schlawack" s = attrs = attributes ib = attrib = attr __all__ = [ "Attribute", "Factory", "NOTHING", "asdict", "assoc", "astuple", "attr", "attrib", "attributes", "attrs", "converters", "evolve", "exceptions", "fields", "filters", "get_run_validators", "has", "ib", "make_class", "s", "set_run_validators", "validate", "validators", ]