/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: Aaron Bentley
Date: 2006-04-08 23:57:33 UTC
mto: (1731.2.9 nested-trees) (2234.6.1 bzr.0.14) (2229.2.4 reserved-ids) (2323.6.9 0.15-integration) (1551.19.24 Aaron's mergeable stuff)
mto: This revision was merged to the branch mainline in revision 1669.
Revision ID: aaron.bentley@utoronto.ca-20060408235733-555b6583f267b843

Indicate conflicts from merge_lines, insead of guessing

files modified:
bzrlib/merge.py

bzrlib/tests/test_textmerge.py

bzrlib/textmerge.py

bzrlib/versionedfile.py

Show diffs side-by-side

added added

removed removed

bzrlib/merge.py

799

799

and a conflict will be noted.

800

800

"""

801

801

self._check_file(file_id)

802

lines = list(self._merged_lines(file_id))

803

conflicts = '<<<<<<< TREE\n' in lines

802

lines, conflicts = self._merged_lines(file_id)

804

803

self.tt.create_file(lines, trans_id)

805

804

if conflicts:

806

805

self._raw_conflicts.append(('text conflict', trans_id))

Older »