← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_transform.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_transform.py
2442
2442
            ('new-a', 'e\n'),
2443
2443
            ('new-b', 'f\n'),
2444
2444
        ], list(tree_a.plan_file_merge('file-id', tree_b)))
 
2445
 
 
2446
    def test_walkdirs(self):
 
2447
        preview = self.get_empty_preview()
 
2448
        preview.version_file('tree-root', preview.root)
 
2449
        preview_tree = preview.get_preview_tree()
 
2450
        file_trans_id = preview.new_file('a', preview.root, 'contents',
 
2451
                                         'a-id')
 
2452
        expected = [(('', 'tree-root'),
 
2453
                    [('a', 'a', 'file', None, 'a-id', 'file')])]
 
2454
        self.assertEqual(expected, list(preview_tree.walkdirs()))