~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-08-15 03:18:20 UTC
  • mfrom: (1910.2.6 format-bumps)
  • Revision ID: pqm@pqm.ubuntu.com-20060815031820-fde63c7ba995e484
Root entry always has a revision id

Show diffs side-by-side

added added

removed removed

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