/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/merge.py

  • Committer: John Arbash Meinel
  • Date: 2008-03-14 16:23:28 UTC
  • mfrom: (3276 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3279.
  • Revision ID: john@arbash-meinel.com-20080314162328-9uc5ut91w0at3otd
[merge] bzr.dev 3276

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
573
573
        if self.change_reporter is not None:
574
574
            from bzrlib import delta
575
575
            delta.report_changes(
576
 
                self.tt._iter_changes(), self.change_reporter)
 
576
                self.tt.iter_changes(), self.change_reporter)
577
577
        self.cook_conflicts(fs_conflicts)
578
578
        for conflict in self.cooked_conflicts:
579
579
            warning(conflict)
588
588
        executable3 is a tuple of execute-bit values for base, other and this.
589
589
        """
590
590
        result = []
591
 
        iterator = self.other_tree._iter_changes(self.base_tree,
 
591
        iterator = self.other_tree.iter_changes(self.base_tree,
592
592
                include_unchanged=True, specific_files=self.interesting_files,
593
593
                extra_trees=[self.this_tree])
594
594
        for (file_id, paths, changed, versioned, parents, names, kind,