← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

Unshelved all changes except those related to removing RootEntry

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
1558
1558
        # the XML is now updated with text versions
1559
1559
        if __debug__:
1560
1560
            for file_id in inv:
 
1561
                if inv.is_root(file_id):
 
1562
                    continue
1561
1563
                ie = inv[file_id]
1562
 
                if ie.kind == 'root_directory':
1563
 
                    continue
1564
1564
                assert hasattr(ie, 'revision'), \
1565
1565
                    'no revision on {%s} in {%s}' % \
1566
1566
                    (file_id, rev.revision_id)
1580
1580
               rev_id)
1581
1581
        parent_invs = map(self._load_updated_inventory, present_parents)
1582
1582
        for file_id in inv:
 
1583
            if inv.is_root(file_id):
 
1584
                continue
1583
1585
            ie = inv[file_id]
1584
1586
            self._convert_file_version(rev, ie, parent_invs)
1585
1587
 
1589
1591
        The file needs to be added into the weave if it is a merge
1590
1592
        of >=2 parents or if it's changed from its parent.
1591
1593
        """
1592
 
        if ie.kind == 'root_directory':
1593
 
            return
1594
1594
        file_id = ie.file_id
1595
1595
        rev_id = rev.revision_id
1596
1596
        w = self.text_weaves.get(file_id)