/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/workingtree_implementations/test_basis_inventory.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/workingtree_implementations/test_basis_inventory.py
60
60
    def test_basis_inv_gets_revision(self):
61
61
        """When the inventory of the basis tree has no revision id it gets set.
62
62
 
63
 
        It gets set during set_last_revision.
 
63
        It gets set during set_parent_trees() or set_parent_ids().
64
64
        """
65
65
        tree = self.make_branch_and_tree('.')
66
66
        tree.lock_write()
 
67
        # TODO change this to use CommitBuilder
67
68
        tree.branch.repository.control_weaves.get_weave('inventory',
68
69
            tree.branch.repository.get_transaction()
69
70
            ).add_lines('r1', [], [
79
80
        tree.branch.repository.add_revision('r1', rev)
80
81
        tree.unlock()
81
82
        tree.branch.append_revision('r1')
82
 
        tree.set_last_revision('r1')
 
83
        tree.set_parent_trees(
 
84
            [('r1', tree.branch.repository.revision_tree('r1'))])
83
85
        # TODO: we should deserialise the file here, rather than peeking
84
86
        # without parsing, but to do this properly needs a serialiser on the
85
87
        # tree object that abstracts whether it is xml/rio/etc.