External merge

Merge lp://staging/~verterok/bzr-extmerge/distutils into lp://staging/~zindar/bzr-extmerge/trunk

  1. distutils
  2. Merge into trunk
Proposed by Guillermo Gonzalez
Status: Merged
Merged at revision: not available
Proposed branch: lp://staging/~verterok/bzr-extmerge/distutils
Merge into: lp://staging/~zindar/bzr-extmerge/trunk
Diff against target: None lines
To merge this branch: bzr merge lp://staging/~verterok/bzr-extmerge/distutils
Reviewer Review Type Date Requested Status
Erik Bågfors Pending
Review via email: mp+12285@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Guillermo Gonzalez (verterok) wrote :

This branch adds a simple setup.py in order to ease packaging

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'setup.py'
2--- setup.py 1970-01-01 00:00:00 +0000
3+++ setup.py 2009-03-11 05:22:02 +0000
4@@ -0,0 +1,21 @@
5+#!/usr/bin/env python2.4
6+try:
7+ from setuptools import setup
8+except ImportError:
9+ from distutils.core import setup
10+
11+setup(name='bzr-extmerge',
12+ description='External merge plugin for Bazaar',
13+ keywords='plugin bzr merge',
14+ version='0.0.1',
15+ url='http://erik.bagfors.nu/bzr-plugins/extmerge/',
16+ download_url='http://erik.bagfors.nu/bzr-plugins/extmerge/',
17+ license='GPLv2',
18+ author='Erik Bahfors',
19+ author_email='erik@bagfors.nu',
20+ long_description="""
21+ This plugin calls a user defined tool, if that exists. Otherwise, it tries kdiff3, xxdiff and opendiff in that order.
22+ """,
23+ package_dir={'bzrlib.plugins.extmerge':'.'},
24+ packages=['bzrlib.plugins.extmerge']
25+ )

Subscribers

People subscribed via source and target branches

to all changes: