← 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: 2006-02-23 15:12:47 UTC
  • mto: (2027.1.2 revert-subpath-56549)
  • mto: This revision was merged to the branch mainline in revision 1575.
  • Revision ID: abentley@panoramicfeedback.com-20060223151247-9dc5e11197026907
Made weave conflict markers customizable, standardized defaults

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
745
745
        this_i = weave.lookup(this_revision_id)
746
746
        other_i = weave.lookup(other_revision_id)
747
747
        plan =  weave.plan_merge(this_i, other_i)
748
 
        return weave.weave_merge(plan)
 
748
        return weave.weave_merge(plan, '<<<<<<< TREE\n', 
 
749
                                       '>>>>>>> MERGE-SOURCE\n')
749
750
 
750
751
    def text_merge(self, file_id, trans_id):
751
752
        """Perform a (weave) text merge for a given file and file-id.
754
755
        """
755
756
        self._check_file(file_id)
756
757
        lines = self._merged_lines(file_id)
757
 
        conflicts = '<<<<<<<\n' in lines
 
758
        conflicts = '<<<<<<< TREE\n' in lines
758
759
        self.tt.create_file(lines, trans_id)
759
760
        if conflicts:
760
761
            self._raw_conflicts.append(('text conflict', trans_id))