← 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: John Arbash Meinel
  • Date: 2009-08-03 20:38:39 UTC
  • mto: This revision was merged to the branch mainline in revision 4592.
  • Revision ID: john@arbash-meinel.com-20090803203839-du9y39adazy9qdly
more updates to get things to build cleanly.

1) delete the release directories because it seems that gf.recipe.bzr doesn't
clean them up when you update to a new release.
2) fix 'clean-installer-all'. It is a lot more simple now, as we just nuke the
whole build-win32 directory.

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')
2150
2149
        tree.add('a', 'a-id')
2151
2150
        tree.commit('rev1', rev_id='rev1')
2152
2151
        return tree.branch.repository.revision_tree('rev1')
2668
2667
 
2669
2668
    def test_merge_preview_into_workingtree(self):
2670
2669
        tree = self.make_branch_and_tree('tree')
2671
 
        tree.set_root_id('TREE_ROOT')
2672
2670
        tt = TransformPreview(tree)
2673
2671
        self.addCleanup(tt.finalize)
2674
2672
        tt.new_file('name', tt.root, 'content', 'file-id')
2675
2673
        tree2 = self.make_branch_and_tree('tree2')
2676
 
        tree2.set_root_id('TREE_ROOT')
2677
2674
        pb = progress.DummyProgress()
2678
2675
        merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
2679
2676
                                         pb, tree.basis_tree())