← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/mutabletree.py

Merge bzr.dev to resolve news conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/mutabletree.py
545
545
                        this_ie = None
546
546
                    else:
547
547
                        this_ie = inv[this_id]
 
548
                        # Same as in _add_one below, if the inventory doesn't
 
549
                        # think this is a directory, update the inventory
 
550
                        if this_ie.kind != 'directory':
 
551
                            this_ie = inventory.make_entry('directory',
 
552
                                this_ie.name, this_ie.parent_id, this_id)
 
553
                            del inv[this_id]
 
554
                            inv.add(this_ie)
548
555
 
549
556
                for subf in sorted(os.listdir(abspath)):
550
557
                    # here we could use TreeDirectory rather than