← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/add.py

  • Committer: Patch Queue Manager
  • Date: 2012-02-07 00:57:24 UTC
  • mfrom: (6405.2.18 bzr)
  • Revision ID: pqm@pqm.ubuntu.com-20120207005724-xvfawh5exf1ohusu
(jelmer) Rename Tree.inventory to Tree.root_inventory. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/add.py
129
129
        """
130
130
 
131
131
        if self.base_tree.has_id(parent_ie.file_id):
132
 
            base_parent_ie = self.base_tree.inventory[parent_ie.file_id]
 
132
            # FIXME: Handle nested trees
 
133
            base_parent_ie = self.base_tree.root_inventory[parent_ie.file_id]
133
134
            base_child_ie = base_parent_ie.children.get(
134
135
                osutils.basename(path))
135
136
            if base_child_ie is not None: