← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/tree_implementations/test_test_trees.py

  • Committer: John Arbash Meinel
  • Date: 2009-02-23 15:29:35 UTC
  • mfrom: (3943.7.7 bzr.code_style_cleanup)
  • mto: This revision was merged to the branch mainline in revision 4033.
  • Revision ID: john@arbash-meinel.com-20090223152935-oel9m92mwcc6nb4h
Merge the removal of all trailing whitespace, and resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/tree_implementations/test_test_trees.py
166
166
                'symlink',
167
167
                 ]),
168
168
            set(iter(tree)))
169
 
        # note that the order of the paths and fileids is deliberately 
 
169
        # note that the order of the paths and fileids is deliberately
170
170
        # mismatched to ensure that the result order is path based.
171
171
        self.assertEqual(
172
172
            [('', tree_root, 'directory'),
199
199
                 u'0utf\u1234file'.encode('utf8'),
200
200
                 ]),
201
201
            set(iter(tree)))
202
 
        # note that the order of the paths and fileids is deliberately 
 
202
        # note that the order of the paths and fileids is deliberately
203
203
        # mismatched to ensure that the result order is path based.
204
204
        self.assertEqual(
205
205
            [('', tree_root, 'directory'),