Mercurial > hg
view setup.py @ 275:61d45b0ba8fb
various merge improvements
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
various merge improvements
add -C flag: force update and overwrite local changes
add -m flag: allow merges with conflicts
we no longer do merge by default
and we print a warning message when the merge fails
fix bug in printing merge failure message
fix bug diffing files in 'm' state
manifest hash: 75545a6db45d1e371082343d01c9f177df0f9db3
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCpm6tywK+sNU5EO8RAvb+AJ0euC3YkUYA944hds3ooPxbw6NpVwCfc1dj
TiNsPIds560S5jgw44eWNto=
=GPXN
-----END PGP SIGNATURE-----
author | mpm@selenic.com |
---|---|
date | Tue, 07 Jun 2005 20:06:05 -0800 |
parents | afe895fcc0d0 |
children | 8b067bde6679 25afb21d97ba |
line wrap: on
line source
#!/usr/bin/env python # This is the mercurial setup script. # # './setup.py install', or # './setup.py --help' for more options import glob from distutils.core import setup, Extension from distutils.command.install_data import install_data class install_package_data(install_data): def finalize_options(self): self.set_undefined_options('install', ('install_lib', 'install_dir')) install_data.finalize_options(self) setup(name='mercurial', version='0.5b', author='Matt Mackall', author_email='mpm@selenic.com', url='http://selenic.com/mercurial', description='scalable distributed SCM', license='GNU GPL', packages=['mercurial'], ext_modules=[Extension('mercurial.mpatch', ['mercurial/mpatch.c'])], data_files=[('mercurial/templates', ['templates/map'] + glob.glob('templates/map-*') + glob.glob('templates/*.tmpl'))], cmdclass = { 'install_data' : install_package_data }, scripts=['hg', 'hgmerge'])