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

  • Committer: Jelmer Vernooij
  • Date: 2018-08-08 02:14:32 UTC
  • mfrom: (7063 work)
  • mto: This revision was merged to the branch mainline in revision 7065.
  • Revision ID: jelmer@jelmer.uk-20180808021432-nomib3je4cu2xqkm
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/status.py
316
316
        for num, sub_merge, depth, eom in rev_id_iterator:
317
317
            rev = revisions[sub_merge]
318
318
            if rev is None:
319
 
                to_file.write(sub_prefix + '(ghost) ' + sub_merge + '\n')
 
319
                to_file.write(sub_prefix + '(ghost) ' + sub_merge.decode('utf-8') + '\n')
320
320
                continue
321
321
            show_log_message(revisions[sub_merge], sub_prefix)
322
322