← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/inventory.py

Merge lp:bzr/2.2.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/inventory.py
1649
1649
            # parent_to_children with at least the tree root.)
1650
1650
            return other
1651
1651
        cache = self._fileid_to_entry_cache
1652
 
        try:
1653
 
            remaining_children = collections.deque(parent_to_children[self.root_id])
1654
 
        except:
1655
 
            import pdb; pdb.set_trace()
1656
 
            raise
 
1652
        remaining_children = collections.deque(parent_to_children[self.root_id])
1657
1653
        while remaining_children:
1658
1654
            file_id = remaining_children.popleft()
1659
1655
            ie = cache[file_id]