← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/inventory.py

Merge bzr.dev to resolve news conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/inventory.py
836
836
                if ie.kind == 'directory':
837
837
                    descend(ie, child_path)
838
838
 
839
 
        descend(self.root, u'')
 
839
        if self.root is not None:
 
840
            descend(self.root, u'')
840
841
        return accum
841
842
 
842
843
    def directories(self):