/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: Vincent Ladeuil
  • Date: 2012-02-14 17:22:37 UTC
  • mfrom: (6466 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6468.
  • Revision ID: v.ladeuil+lp@free.fr-20120214172237-7dv7er3n4uy8d5m4
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
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),