← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

Merge in bzr-dir phase 2.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
269
269
        self.branch.lock_write()
270
270
        try:
271
271
            self.work_inv = self.work_tree.inventory
272
 
            self.basis_tree = self.branch.basis_tree()
 
272
            self.basis_tree = self.work_tree.basis_tree()
273
273
            self.basis_inv = self.basis_tree.inventory
274
274
 
275
275
            self._gather_parents()