← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Aaron Bentley
  • Date: 2005-12-25 00:38:48 UTC
  • mto: (1185.67.11 bzr.revision-storage)
  • mto: This revision was merged to the branch mainline in revision 1550.
  • Revision ID: aaron.bentley@utoronto.ca-20051225003848-111ac71170cb2605
Renamed Branch.storage to Branch.repository

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
670
670
                    other_revision = old_revision_history[-1]
671
671
                else:
672
672
                    other_revision = None
 
673
                repository = self.branch.repository
673
674
                merge_inner(self.branch,
674
675
                            self.branch.basis_tree(), 
675
 
                            self.branch.storage.revision_tree(other_revision))
 
676
                            repository.revision_tree(other_revision))
676
677
            return count
677
678
        finally:
678
679
            source.unlock()
791
792
            except:
792
793
                pass
793
794
        try:
794
 
            xml = self.branch.storage.get_inventory_xml(new_revision)
 
795
            xml = self.branch.repository.get_inventory_xml(new_revision)
795
796
            path = self._basis_inventory_name(new_revision)
796
797
            self.branch.control_files.put_utf8(path, xml)
797
798
        except WeaveRevisionNotPresent: