~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to setup.py

  • Committer: Martin Pool
  • Date: 2005-08-25 05:58:05 UTC
  • mfrom: (974.1.36)
  • Revision ID: mbp@sourcefrog.net-20050825055805-8c892bc3c2d75131
- merge aaron's merge improvements:

  * When merging, pull in all missing revisions from the source
    branch. 

  * Detect common ancestors by looking at the whole ancestry graph, 
    rather than just mainline history.

  Some changes to reconcile this with parallel updates to the test and
  trace code.

aaron.bentley@utoronto.ca-20050823052551-f3401a8b57d9126f

Show diffs side-by-side

added added

removed removed

Lines of Context:
13
13
      url='http://www.bazaar-ng.org/',
14
14
      description='Friendly distributed version control system',
15
15
      license='GNU GPL v2',
16
 
      packages=['bzrlib'],
 
16
      packages=['bzrlib',
 
17
                'bzrlib.plugins',
 
18
                'bzrlib.selftest',
 
19
                'bzrlib.util',
 
20
                'bzrlib.util.elementtree',
 
21
                'bzrlib.util.effbot.org',
 
22
                'bzrlib.util.urlgrabber'],
17
23
      scripts=['bzr'])