/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 breezy/merge.py

  • Committer: Jelmer Vernooij
  • Date: 2018-06-18 02:13:57 UTC
  • mto: (6973.12.2 python3-k)
  • mto: This revision was merged to the branch mainline in revision 7004.
  • Revision ID: jelmer@jelmer.uk-20180618021357-xz802zqfmrf7zv1z
More test fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/merge.py
1454
1454
        this_lines = self.get_lines(self.this_tree, this_path, file_id)
1455
1455
        m3 = merge3.Merge3(base_lines, this_lines, other_lines,
1456
1456
                           is_cherrypick=self.cherrypick)
1457
 
        start_marker = "!START OF MERGE CONFLICT!" + "I HOPE THIS IS UNIQUE"
 
1457
        start_marker = b"!START OF MERGE CONFLICT!" + b"I HOPE THIS IS UNIQUE"
1458
1458
        if self.show_base is True:
1459
1459
            base_marker = '|' * 7
1460
1460
        else:
1462
1462
 
1463
1463
        def iter_merge3(retval):
1464
1464
            retval["text_conflicts"] = False
1465
 
            for line in m3.merge_lines(name_a = "TREE",
1466
 
                                       name_b = "MERGE-SOURCE",
1467
 
                                       name_base = "BASE-REVISION",
 
1465
            for line in m3.merge_lines(name_a = b"TREE",
 
1466
                                       name_b = b"MERGE-SOURCE",
 
1467
                                       name_base = b"BASE-REVISION",
1468
1468
                                       start_marker=start_marker,
1469
1469
                                       base_marker=base_marker,
1470
1470
                                       reprocess=self.reprocess):
1471
1471
                if line.startswith(start_marker):
1472
1472
                    retval["text_conflicts"] = True
1473
 
                    yield line.replace(start_marker, '<' * 7)
 
1473
                    yield line.replace(start_marker, b'<' * 7)
1474
1474
                else:
1475
1475
                    yield line
1476
1476
        retval = {}