/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/workingtree.py

Merge bzr.dev.

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
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:
922
924
        if to_dir_id == None and to_name != '':
923
925
            raise BzrError("destination %r is not a versioned directory" % to_name)
924
926
        to_dir_ie = inv[to_dir_id]
925
 
        if to_dir_ie.kind not in ('directory', 'root_directory'):
 
927
        if to_dir_ie.kind != 'directory':
926
928
            raise BzrError("destination %r is not a directory" % to_abs)
927
929
 
928
930
        to_idpath = inv.get_idpath(to_dir_id)