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

  • Committer: Jelmer Vernooij
  • Date: 2018-07-02 20:37:44 UTC
  • mfrom: (7025 work)
  • mto: This revision was merged to the branch mainline in revision 7027.
  • Revision ID: jelmer@jelmer.uk-20180702203744-3i0bimk0r5pfzjzl
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/annotate.py
201
201
            repository.iter_revisions(revision_ids)
202
202
            if entry[1] is not None)
203
203
    for origin, text in annotations:
204
 
        text = text.rstrip('\r\n')
 
204
        text = text.rstrip(b'\r\n')
205
205
        if origin == last_origin:
206
206
            (revno_str, author, date_str) = ('', '', '')
207
207
        else: