← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/inventory.py

Merge from integration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/inventory.py
418
418
        self.children = {}
419
419
        self.kind = 'root_directory'
420
420
        self.parent_id = None
421
 
        self.name = ''
 
421
        self.name = u''
422
422
 
423
423
    def __eq__(self, other):
424
424
        if not isinstance(other, RootEntry):
782
782
                if ie.kind == 'directory':
783
783
                    descend(ie, child_path)
784
784
 
785
 
        descend(self.root, '')
 
785
        descend(self.root, u'')
786
786
        return accum
787
787
 
788
788
 
799
799
            for name, child_ie in kids:
800
800
                child_path = os.path.join(parent_path, name)
801
801
                descend(child_ie, child_path)
802
 
        descend(self.root, '')
 
802
        descend(self.root, u'')
803
803
        return accum
804
804
        
805
805