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

  • Committer: Jelmer Vernooij
  • Date: 2018-06-14 10:06:05 UTC
  • mfrom: (6963.2.19 python3-weave-fmt)
  • Revision ID: jelmer@jelmer.uk-20180614100605-7sg9ai8wdvpknkmr
Merge lp:~jelmer/brz/python3-weave-fmt.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/weave_fmt/workingtree.py
85
85
        xml5.serializer_v5.write_inventory(inv, sio, working=True)
86
86
        sio.seek(0)
87
87
        transport.put_file('inventory', sio, file_mode)
88
 
        transport.put_bytes('pending-merges', '', file_mode)
 
88
        transport.put_bytes('pending-merges', b'', file_mode)
89
89
 
90
90
    def initialize(self, a_controldir, revision_id=None, from_branch=None,
91
91
                   accelerator_tree=None, hardlink=False):