Mercurial > evolve
view setup.py @ 3849:a17d4934c5ce
tests: fix a test case to not create conflicts
This is the test case where we are testing about divergence resolution of stack
of patches. If the stack is as follows:
C1 C2
| |
B1 B2
| |
A1 A2
\/
base
And A1-A2, B1-B2 and C1-C2 are content-divergent, and merging A1-A2 results in
conflicts.
Now if you resolve conflicts and continue resoling B1-B2, the conflicts of A1-A2
will still be there. We need somehow to understand the work we has done and not
create conflicts again.
To test the evolution functionality for now, we make sure conflicts does not
occur.
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Thu, 14 Jun 2018 01:39:11 +0530 |
parents | efac9aad0963 |
children | 9f2e480ad786 |
line wrap: on
line source
import os from distutils.core import setup from os.path import dirname, join META_PATH = 'hgext3rd/evolve/metadata.py' def get_metadata(): meta = {} fullpath = join(dirname(__file__), META_PATH) execfile(fullpath, meta) return meta def get_version(): '''Read version info from a file without importing it''' return get_metadata()['__version__'] def min_hg_version(): '''Read version info from a file without importing it''' return get_metadata()['minimumhgversion'] py_modules = [ 'hgext3rd.serverminitopic', ] py_packages = [ 'hgext3rd', 'hgext3rd.evolve', 'hgext3rd.evolve.thirdparty', 'hgext3rd.topic', ] if os.environ.get('INCLUDE_INHIBIT'): py_modules.append('hgext3rd.evolve.hack.inhibit') py_modules.append('hgext3rd.evolve.hack.directaccess') setup( name='hg-evolve', version=get_version(), author='Pierre-Yves David', author_email='pierre-yves.david@ens-lyon.org', maintainer='Pierre-Yves David', maintainer_email='pierre-yves.david@ens-lyon.org', url='https://www.mercurial-scm.org/doc/evolution/', description='Flexible evolution of Mercurial history.', long_description=open('README').read(), keywords='hg mercurial', license='GPLv2+', py_modules=py_modules, packages=py_packages )