← 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: 2007-07-19 15:44:17 UTC
  • mto: (1551.19.24 Aaron's mergeable stuff)
  • mto: This revision was merged to the branch mainline in revision 2639.
  • Revision ID: abentley@panoramicfeedback.com-20070719154417-gb6sri5503b1u89w
Tweak from review comments

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
913
913
        There is no distinction between lines that are meant to contain <<<<<<<
914
914
        and conflicts.
915
915
        """
916
 
        plan = self.this_tree.plan_merge(file_id, self.other_tree)
917
 
        wm = PlanWeaveMerge(plan, '<<<<<<< TREE\n', '>>>>>>> MERGE-SOURCE\n')
918
 
        return wm.merge_lines(self.reprocess)
 
916
        plan = self.this_tree.plan_file_merge(file_id, self.other_tree)
 
917
        textmerge = PlanWeaveMerge(plan, '<<<<<<< TREE\n',
 
918
            '>>>>>>> MERGE-SOURCE\n')
 
919
        return textmerge.merge_lines(self.reprocess)
919
920
 
920
921
    def text_merge(self, file_id, trans_id):
921
922
        """Perform a (weave) text merge for a given file and file-id.