/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-05 17:35:14 UTC
  • mfrom: (3250 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3280.
  • Revision ID: john@arbash-meinel.com-20080305173514-933wremo23r9doex
[merge] bzr.dev 3250

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
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: