← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testinv.py

  • Committer: Jelmer Vernooij
  • Date: 2005-11-04 17:26:05 UTC
  • mfrom: (1185.16.146)
  • mto: (1185.33.1)
  • mto: This revision was merged to the branch mainline in revision 1509.
  • Revision ID: jelmer@samba.org-20051104172605-9288f261492667fd
Merge from Martin

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/testinv.py
152
152
        self.inv_1 = self.branch.get_inventory('1')
153
153
        self.file_1 = self.inv_1['fileid']
154
154
        self.tree_2 = self.branch.working_tree()
155
 
        self.inv_2 = self.branch.inventory
 
155
        self.inv_2 = self.tree_2.read_working_inventory()
156
156
        self.file_2 = self.inv_2['fileid']
157
157
        if has_symlinks():
158
158
            self.link_1 = self.inv_1['linkid']