← 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: Andrew Bennetts
  • Date: 2009-10-02 05:43:41 UTC
  • mfrom: (4634.52.10 2.0)
  • mto: This revision was merged to the branch mainline in revision 4723.
  • Revision ID: andrew.bennetts@canonical.com-20091002054341-99yxpjenx8cagpxn
Merge lp:bzr/2.0 into lp:bzr, duplicating relevant NEWS entries for 2.1.0.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transform.py
2629
2629
 
2630
2630
    def test_walkdirs(self):
2631
2631
        preview = self.get_empty_preview()
2632
 
        preview.version_file('tree-root', preview.root)
 
2632
        root = preview.new_directory('', ROOT_PARENT, 'tree-root')
 
2633
        # FIXME: new_directory should mark root.
 
2634
        preview.adjust_path('', ROOT_PARENT, root)
2633
2635
        preview_tree = preview.get_preview_tree()
2634
2636
        file_trans_id = preview.new_file('a', preview.root, 'contents',
2635
2637
                                         'a-id')
2666
2668
        self.addCleanup(work_tree.unlock)
2667
2669
        preview = TransformPreview(work_tree)
2668
2670
        self.addCleanup(preview.finalize)
2669
 
        preview_tree = preview.get_preview_tree()
2670
2671
        file_trans_id = preview.trans_id_file_id('file-id')
2671
2672
        preview.delete_contents(file_trans_id)
2672
2673
        preview.create_file('a\nb\n', file_trans_id)
2673
2674
        pb = progress.DummyProgress()
 
2675
        preview_tree = preview.get_preview_tree()
2674
2676
        merger = Merger.from_revision_ids(pb, preview_tree,
2675
2677
                                          child_tree.branch.last_revision(),
2676
2678
                                          other_branch=child_tree.branch,