← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: John Arbash Meinel
  • Date: 2006-08-14 16:16:53 UTC
  • mto: (1946.2.6 reduce-knit-churn)
  • mto: This revision was merged to the branch mainline in revision 1919.
  • Revision ID: john@arbash-meinel.com-20060814161653-54cdcdadcd4e9003
Remove bogus entry from BRANCH.TODO

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
322
322
        self.branch.break_lock()
323
323
 
324
324
    def _set_inventory(self, inv):
325
 
        assert inv.root is not None
326
325
        self._inventory = inv
327
326
        self.path2id = self._inventory.path2id
328
327
 
400
399
            try:
401
400
                xml = self.read_basis_inventory()
402
401
                inv = bzrlib.xml5.serializer_v5.read_inventory_from_string(xml)
403
 
                inv.root.revision = revision_id
404
402
            except NoSuchFile:
405
403
                inv = None
406
404
            if inv is not None and inv.revision_id == revision_id: