← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

Refactored out ControlFiles and RevisionStore from _Branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
350
350
                    other_revision = None
351
351
                merge_inner(self.branch,
352
352
                            self.branch.basis_tree(), 
353
 
                            self.branch.revision_tree(other_revision))
 
353
                            self.branch.storage.revision_tree(other_revision))
354
354
        finally:
355
355
            source.unlock()
356
356