← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_info.py

  • Committer: Robert Collins
  • Date: 2008-09-02 05:28:37 UTC
  • mfrom: (3675 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3677.
  • Revision ID: robertc@robertcollins.net-20080902052837-ec3qlv41q5e7f6fl
Resolve conflicts with NEWS.

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', '1.6', '1.6-rich-root'):
150
 
                expected = '1.6 or 1.6-rich-root or ' \
 
149
                'rich-root-pack', '1.6', '1.6.1-rich-root'):
 
150
                expected = '1.6 or 1.6.1-rich-root or ' \
151
151
                    'dirstate or dirstate-tags or pack-0.92 or'\
152
152
                    ' rich-root or rich-root-pack'
153
153
            if key in ('knit', 'metaweave'):