← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_info.py

Merge with extras

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', 'stacked', 'stacked-rich-root'):
150
 
                expected = 'dirstate or dirstate-tags or pack-0.92 or'\
151
 
                    ' rich-root or rich-root-pack or stacked or stacked-rich-root'
 
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'\
 
152
                    ' rich-root or rich-root-pack'
152
153
            if key in ('knit', 'metaweave'):
153
154
                expected = 'knit or metaweave'
154
155
            self.assertCheckoutDescription(key, expected)