/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_info.py

  • Committer: Andrew Bennetts
  • Date: 2008-07-28 06:53:44 UTC
  • mfrom: (3581 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3583.
  • Revision ID: andrew.bennetts@canonical.com-20080728065344-ocndjoycs903q6fz
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_info.py
146
146
            expected = None
147
147
            if key in ('dirstate', 'dirstate-tags', 'dirstate-with-subtree',
148
148
                'pack-0.92', 'pack-0.92-subtree', 'rich-root',
149
 
                'rich-root-pack'):
150
 
                expected = 'dirstate or dirstate-tags or pack-0.92 or'\
 
149
                'rich-root-pack', '1.6', '1.6-rich-root'):
 
150
                expected = '1.6 or 1.6-rich-root or ' \
 
151
                    'dirstate or dirstate-tags or pack-0.92 or'\
151
152
                    ' rich-root or rich-root-pack'
152
153
            if key in ('knit', 'metaweave'):
153
154
                expected = 'knit or metaweave'