/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/inventory.py

  • Committer: Robert Collins
  • Date: 2007-03-06 12:28:18 UTC
  • mto: (2321.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 2322.
  • Revision ID: robertc@robertcollins.net-20070306122818-xk0lc3l01ecl6vbc
Get merge_nested finally working: change nested tree iterators to take file_ids, and ensure the right branch is connected to in the merge logic. May not be suitable for shared repositories yet.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/inventory.py
843
843
    def _read_tree_state(self, path, work_tree):
844
844
        """Populate fields in the inventory entry from the given tree.
845
845
        """
846
 
        self.reference_revision = work_tree.get_reference_revision(self, path)
 
846
        self.reference_revision = work_tree.get_reference_revision(
 
847
            self.file_id, path)
847
848
 
848
849
    def _forget_tree_state(self):
849
850
        self.reference_revision = None