← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-03-22 08:20:09 UTC
  • mfrom: (1558.6.4 bzr.weavemerge)
  • Revision ID: pqm@pqm.ubuntu.com-20060322082009-3520c8aac5775bea
Fixed merge-type weave

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
797
797
        and a conflict will be noted.
798
798
        """
799
799
        self._check_file(file_id)
800
 
        lines = self._merged_lines(file_id)
 
800
        lines = list(self._merged_lines(file_id))
801
801
        conflicts = '<<<<<<< TREE\n' in lines
802
802
        self.tt.create_file(lines, trans_id)
803
803
        if conflicts: