/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: Robert Collins
  • Date: 2005-10-18 23:47:12 UTC
  • mfrom: (0.2.1)
  • Revision ID: robertc@robertcollins.net-20051018234712-45a83974f691c860
Bugfix the new pull --clobber to not generate spurious conflicts.

When --clobber clobbered the history, a bad merge base was used.

Supporting this:
* merge.merge_inner now has tempdir as an optional parameter. (Robert Collins)

* Tree.kind is not recorded at the top level of the hierarchy, as it was
  missing on EmptyTree, leading to a bug with merge on EmptyTrees.
  (Robert Collins)

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
 
      )