← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tree.py

  • Committer: Marius Kruger
  • Date: 2007-04-13 19:45:40 UTC
  • mto: This revision was merged to the branch mainline in revision 2455.
  • Revision ID: amanic@gmail.com-20070413194540-jaf9n9wzhx4pd66c
undo tree.has_id fake-bugfix, which seems to not be needed anymore..

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tree.py
530
530
        new_pending = set()
531
531
        for file_id in pending:
532
532
            for tree in trees:
533
 
                if not tree.has_id(file_id) or not file_id in tree.inventory:
 
533
                if not tree.has_id(file_id):
534
534
                    continue
535
535
                entry = tree.inventory[file_id]
536
536
                for child in getattr(entry, 'children', {}).itervalues():