~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tree.py

  • Committer: Jelmer Vernooij
  • Date: 2012-04-02 01:44:26 UTC
  • mfrom: (6518 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6519.
  • Revision ID: jelmer@samba.org-20120402014426-0o5qtysohyl006b2
merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1359
1359
                        if old_entry is None:
1360
1360
                            # Reusing a discarded change.
1361
1361
                            old_entry = self._get_entry(self.source, file_id)
1362
 
                        for child in self.source.iter_children(file_id):
1363
 
                            precise_file_ids.add(child.file_id)
 
1362
                        precise_file_ids.update(
 
1363
                                self.source.iter_children(file_id))
1364
1364
                    changed_file_ids.add(result[0])
1365
1365
                    yield result
1366
1366