← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Aaron Bentley
  • Date: 2008-03-07 14:15:10 UTC
  • mto: This revision was merged to the branch mainline in revision 3262.
  • Revision ID: aaron@aaronbentley.com-20080307141510-j1w043r5ir8lap88
Make Tree.iter_changes a public method

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
565
565
        if self.change_reporter is not None:
566
566
            from bzrlib import delta
567
567
            delta.report_changes(
568
 
                self.tt._iter_changes(), self.change_reporter)
 
568
                self.tt.iter_changes(), self.change_reporter)
569
569
        self.cook_conflicts(fs_conflicts)
570
570
        for conflict in self.cooked_conflicts:
571
571
            warning(conflict)
580
580
        executable3 is a tuple of execute-bit values for base, other and this.
581
581
        """
582
582
        result = []
583
 
        iterator = self.other_tree._iter_changes(self.base_tree,
 
583
        iterator = self.other_tree.iter_changes(self.base_tree,
584
584
                include_unchanged=True, specific_files=self.interesting_files,
585
585
                extra_trees=[self.this_tree])
586
586
        for (file_id, paths, changed, versioned, parents, names, kind,