/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/plugins/git/workingtree.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-07-12 09:58:01 UTC
  • mfrom: (7029.4.9 python3-merge)
  • Revision ID: breezy.the.bot@gmail.com-20180712095801-59ffq76qu4wou2ab
Fix some merge tests on Python 3.

Merged from https://code.launchpad.net/~jelmer/brz/python3-merge/+merge/349097

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/git/workingtree.py
240
240
        except errors.NoSuchRevision as e:
241
241
            raise errors.GhostRevisionUnusableHere(e.revision)
242
242
        if merges:
243
 
            self.control_transport.put_bytes('MERGE_HEAD', '\n'.join(merges),
 
243
            self.control_transport.put_bytes('MERGE_HEAD', b'\n'.join(merges),
244
244
                mode=self.controldir._get_file_mode())
245
245
        else:
246
246
            try:
292
292
            pass
293
293
        else:
294
294
            for l in osutils.split_lines(merges_bytes):
295
 
                revision_id = l.rstrip('\n')
 
295
                revision_id = l.rstrip(b'\n')
296
296
                parents.append(self.branch.lookup_foreign_revision_id(revision_id))
297
297
        return parents
298
298