← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/bundle_data.py

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/bundle_data.py
626
626
 
627
627
    def get_last_changed(self, file_id):
628
628
        path = self.id2path(file_id)
629
 
        if path == '':
630
 
            return None
631
629
        if path in self._last_changed:
632
630
            return self._last_changed[path]
633
631
        return self.base_tree.inventory[file_id].revision
672
670
            inv = Inventory(root_id, self.revision_id)
673
671
        except TypeError:
674
672
            inv = Inventory(revision_id=self.revision_id)
 
673
        inv.root.revision = self.get_last_changed(root_id)
675
674
 
676
675
        def add_entry(file_id):
677
676
            path = self.id2path(file_id)