← 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: Aaron Bentley
  • Date: 2008-10-07 19:07:43 UTC
  • mto: (3363.19.2 fix-iter-changes)
  • mto: This revision was merged to the branch mainline in revision 3777.
  • Revision ID: aaron@aaronbentley.com-20081007190743-w0n16qt57ahg61cw
Start testing merging PreviewTree as OTHER

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transform.py
2497
2497
        self.addCleanup(tt.finalize)
2498
2498
        final_tree = tt.get_preview_tree()
2499
2499
        self.assertEqual('a\nb\nc\n', final_tree.get_file_text('file-id'))
 
2500
 
 
2501
    def test_merge_preview_into_workingtree(self):
 
2502
        tree = self.make_branch_and_tree('tree')
 
2503
        tt = TransformPreview(tree)
 
2504
        self.addCleanup(tt.finalize)
 
2505
        tt.new_file('name', tt.root, 'content', 'file-id')
 
2506
        tree2 = self.make_branch_and_tree('tree2')
 
2507
        pb = progress.DummyProgress()
 
2508
        merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
 
2509
                                         pb, tree.basis_tree())
 
2510
        merger.merge_type = Merge3Merger
 
2511
        merger.do_merge()