/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/tree_implementations/test_tree.py

  • Committer: Aaron Bentley
  • Date: 2007-07-19 15:44:17 UTC
  • mto: (1551.19.24 Aaron's mergeable stuff)
  • mto: This revision was merged to the branch mainline in revision 2639.
  • Revision ID: abentley@panoramicfeedback.com-20070719154417-gb6sri5503b1u89w
Tweak from review comments

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/tree_implementations/test_tree.py
38
38
            self.assertEqual(tree_revision, revision)
39
39
 
40
40
 
41
 
class TestPlanMerge(TestCaseWithTree):
 
41
class TestPlanFileMerge(TestCaseWithTree):
42
42
 
43
 
    def test_plan_merge(self):
 
43
    def test_plan_file_merge(self):
44
44
        work_a = self.make_branch_and_tree('wta')
45
45
        self.build_tree_contents([('wta/file', 'a\nb\nc\nd\n')])
46
46
        work_a.add('file', 'file-id')
61
61
            ('unchanged', 'd\n'),
62
62
            ('new-a', 'e\n'),
63
63
            ('new-b', 'f\n'),
64
 
        ], list(tree_a.plan_merge('file-id', tree_b)))
 
64
        ], list(tree_a.plan_file_merge('file-id', tree_b)))
65
65
 
66
66
 
67
67
class TestReference(TestCaseWithTree):