/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 10:55:37 UTC
  • mfrom: (3275 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3281.
  • Revision ID: john@arbash-meinel.com-20080314105537-v9h2ue0uxvs1dyn6
[merge] bzr.dev 3275

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,
1047
1047
        self.cherrypick = cherrypick
1048
1048
        super(WeaveMerger, self).__init__(working_tree, this_tree, 
1049
1049
                                          base_tree, other_tree, 
 
1050
                                          interesting_files=interesting_files,
1050
1051
                                          interesting_ids=interesting_ids, 
1051
1052
                                          pb=pb, pp=pp, reprocess=reprocess,
1052
1053
                                          change_reporter=change_reporter,
1289
1290
            for b_index in range(last_j, j):
1290
1291
                if b_index in new_b:
1291
1292
                    if b_index in killed_a:
1292
 
                        yield 'conflicted-b', self.lines_b[a_index]
 
1293
                        yield 'conflicted-b', self.lines_b[b_index]
1293
1294
                    else:
1294
1295
                        yield 'new-b', self.lines_b[b_index]
1295
1296
                else: