/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/inventory.py

  • Committer: John Arbash Meinel
  • Date: 2010-08-02 21:31:15 UTC
  • mto: (5050.17.11 2.2)
  • mto: This revision was merged to the branch mainline in revision 5419.
  • Revision ID: john@arbash-meinel.com-20100802213115-a2x1bdjcze9iwwdb
Fix a bug in update_minimal.

If the _maybe_remove_row actually removes a row, then we can't
be positive that our pointer is still correct.
In fact, in this test it is wrong, and leads to an incorrectly
sorted dirstate.

Show diffs side-by-side

added added

removed removed

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