← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/add.py

  • Committer: Martin Pool
  • Date: 2011-06-14 01:43:10 UTC
  • mto: This revision was merged to the branch mainline in revision 6002.
  • Revision ID: mbp@canonical.com-20110614014310-g5ww9c5gieo2cg5k
test_fifo_cache shouldn't have a knownfailure for something that's impossible

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/add.py
86
86
        Else, we look for an entry in the base tree with the same path.
87
87
        """
88
88
 
89
 
        if self.base_tree.has_id(parent_ie.file_id):
 
89
        if (parent_ie.file_id in self.base_tree):
90
90
            base_parent_ie = self.base_tree.inventory[parent_ie.file_id]
91
91
            base_child_ie = base_parent_ie.children.get(
92
92
                osutils.basename(path))