← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_intertree/test_compare.py

  • Committer: Jelmer Vernooij
  • Date: 2012-02-28 10:06:39 UTC
  • mfrom: (6437.40.2 rmbranch-colo)
  • mto: This revision was merged to the branch mainline in revision 6482.
  • Revision ID: jelmer@samba.org-20120228100639-p5gndu91wuqwugti
Merge rmbranch-colo.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_intertree/test_compare.py
542
542
            (from_basename, to_basename), (kind, None), (False, False))
543
543
 
544
544
    def deleted(self, tree, file_id):
545
 
        entry = tree.inventory[file_id]
 
545
        entry = tree.root_inventory[file_id]
546
546
        path = tree.id2path(file_id)
547
547
        return (file_id, (path, None), True, (True, False), (entry.parent_id, None),
548
548
                (entry.name, None), (entry.kind, None),