← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/bundle_data.py

  • Committer: Aaron Bentley
  • Date: 2006-10-12 03:19:14 UTC
  • mto: This revision was merged to the branch mainline in revision 2078.
  • Revision ID: aaron.bentley@utoronto.ca-20061012031914-036d95e1296a45c4
Changes from review comments

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/bundle_data.py
648
648
 
649
649
        assert self.base_tree is not None
650
650
        base_inv = self.base_tree.inventory
651
 
        try:
652
 
            inv = Inventory(None, self.revision_id)
653
 
        except TypeError:
654
 
            inv = Inventory(revision_id=self.revision_id)
 
651
        inv = Inventory(None, self.revision_id)
655
652
 
656
653
        def add_entry(file_id):
657
654
            path = self.id2path(file_id)