/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to setup.py

  • Committer: John Arbash Meinel
  • Date: 2009-04-29 17:02:36 UTC
  • mto: This revision was merged to the branch mainline in revision 4322.
  • Revision ID: john@arbash-meinel.com-20090429170236-v1oe7b235mi73cqs
https://launchpad.net/bugs/328171
Add a per-implementation test that deleting lines conflicts with modifying lines.

At the moment, I don't see a simple way to implement this for LCA merge,
so I'm just marking it as 'expectedFailure'.
However, it works for both Weave merge and for Merge3.
Fixes bug #328171

Show diffs side-by-side

added added

removed removed

Lines of Context:
setup.py
1
 
#!/usr/bin/env python
2
 
 
3
 
from distutils.core import setup
4
 
 
5
 
setup(name='bzr-git',
6
 
      description='Support for Git branches in Bazaar',
7
 
      keywords='plugin bzr git bazaar',
8
 
      version='0.1',
9
 
      url='http://bazaar-vcs.org/BzrForeignBranches/Git',
10
 
      license='GPL',
11
 
      author='Robert Collins',
12
 
      author_email='robertc@robertcollins.net',
13
 
      long_description="""
14
 
      This plugin adds limited support for checking out and viewing 
15
 
      Git branches in Bazaar.
16
 
      """,
17
 
      package_dir={'bzrlib.plugins.git':'.'},
18
 
      packages=['bzrlib.plugins.git'],
19
 
      scripts=['bzr-receive-pack', 'bzr-upload-pack'],
20
 
      )