← 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: Canonical.com Patch Queue Manager
  • Date: 2009-08-14 01:55:25 UTC
  • mfrom: (4600.3.1 tree-transform-set-roots)
  • Revision ID: pqm@pqm.ubuntu.com-20090814015525-jxkc5bufo85chbmy
(robertc) Set root ids in treetransform tests that aren't testing
        root operations. (Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transform.py
2146
2146
    def create_tree(self):
2147
2147
        tree = self.make_branch_and_tree('.')
2148
2148
        self.build_tree_contents([('a', 'content 1')])
 
2149
        tree.set_root_id('TREE_ROOT')
2149
2150
        tree.add('a', 'a-id')
2150
2151
        tree.commit('rev1', rev_id='rev1')
2151
2152
        return tree.branch.repository.revision_tree('rev1')
2667
2668
 
2668
2669
    def test_merge_preview_into_workingtree(self):
2669
2670
        tree = self.make_branch_and_tree('tree')
 
2671
        tree.set_root_id('TREE_ROOT')
2670
2672
        tt = TransformPreview(tree)
2671
2673
        self.addCleanup(tt.finalize)
2672
2674
        tt.new_file('name', tt.root, 'content', 'file-id')
2673
2675
        tree2 = self.make_branch_and_tree('tree2')
 
2676
        tree2.set_root_id('TREE_ROOT')
2674
2677
        pb = progress.DummyProgress()
2675
2678
        merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
2676
2679
                                         pb, tree.basis_tree())