← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_branchbuilder.py

resolve conflicts against trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_branchbuilder.py
321
321
                             ], d_tree)
322
322
        # Because we copied the exact text into *this* tree, the 'c' file
323
323
        # should look like it was not modified in the merge
324
 
        self.assertEqual('C-id', d_tree.inventory['c-id'].revision)
 
324
        self.assertEqual('C-id', d_tree.get_file_revision('c-id'))
325
325
 
326
326
    def test_set_parent_to_null(self):
327
327
        builder = self.build_a_rev()