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

  • Committer: Jelmer Vernooij
  • Date: 2018-02-17 02:02:38 UTC
  • mto: This revision was merged to the branch mainline in revision 6926.
  • Revision ID: jelmer@jelmer.uk-20180217020238-1sarw7txktyw922h
Several more fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/workingtree.py
638
638
 
639
639
    def _set_merges_from_parent_ids(self, parent_ids):
640
640
        merges = parent_ids[1:]
641
 
        self._transport.put_bytes('pending-merges', '\n'.join(merges),
 
641
        self._transport.put_bytes('pending-merges', b'\n'.join(merges),
642
642
            mode=self.controldir._get_file_mode())
643
643
 
644
644
    def _filter_parent_ids_by_ancestry(self, revision_ids):