← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tree.py

  • Committer: Jelmer Vernooij
  • Date: 2010-08-20 19:07:17 UTC
  • mfrom: (5385 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5389.
  • Revision ID: jelmer@samba.org-20100820190717-txm7aiyh6wtumgd3
merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tree.py
1130
1130
            if file_id in to_paths:
1131
1131
                # already returned
1132
1132
                continue
1133
 
            if not self.target.has_id(file_id):
 
1133
            if file_id not in self.target.all_file_ids():
1134
1134
                # common case - paths we have not emitted are not present in
1135
1135
                # target.
1136
1136
                to_path = None