/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/revisiontree.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/revisiontree.py
128
128
        ie = self._inventory[file_id]
129
129
        return ie.symlink_target;
130
130
 
131
 
    def get_reference_revision(self, entry, path=None):
132
 
        return entry.reference_revision
 
131
    def get_reference_revision(self, file_id, path=None):
 
132
        return self.inventory[file_id].reference_revision
133
133
 
134
134
    def get_root_id(self):
135
135
        if self.inventory.root: