/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-07-13 00:24:33 UTC
  • mfrom: (7037 work)
  • mto: This revision was merged to the branch mainline in revision 7039.
  • Revision ID: jelmer@jelmer.uk-20180713002433-dr601ols49ge07fr
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/merge.py
1686
1686
            plan = list(plan)
1687
1687
            trans_id = self.tt.trans_id_file_id(file_id)
1688
1688
            name = self.tt.final_name(trans_id) + '.plan'
1689
 
            contents = ('%11s|%s' % l for l in plan)
 
1689
            contents = (b'%11s|%s' % l for l in plan)
1690
1690
            self.tt.new_file(name, self.tt.final_parent(trans_id), contents)
1691
 
        textmerge = versionedfile.PlanWeaveMerge(plan, '<<<<<<< TREE\n',
1692
 
                                                 '>>>>>>> MERGE-SOURCE\n')
 
1691
        textmerge = versionedfile.PlanWeaveMerge(plan, b'<<<<<<< TREE\n',
 
1692
                                                 b'>>>>>>> MERGE-SOURCE\n')
1693
1693
        lines, conflicts = textmerge.merge_lines(self.reprocess)
1694
1694
        if conflicts:
1695
1695
            base_lines = textmerge.base_from_plan()