/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 bzrlib/tests/test_import_tariff.py

  • Committer: Jelmer Vernooij
  • Date: 2011-04-02 00:08:39 UTC
  • mfrom: (5750 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5751.
  • Revision ID: jelmer@samba.org-20110402000839-qvxpq267q9tqdjrg
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_import_tariff.py
100
100
            'bzrlib.bundle.commands',
101
101
            'bzrlib.cmd_version_info',
102
102
            'bzrlib.externalcommand',
103
 
            'bzrlib.foreign',
 
103
            # foreign branch plugins import the foreign_vcs_registry from 
 
104
            # bzrlib.foreign so it can't be blacklisted
104
105
            'bzrlib.gpg',
105
106
            'bzrlib.info',
106
107
            'bzrlib.merge3',