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

  • Committer: Jelmer Vernooij
  • Date: 2018-07-08 15:47:10 UTC
  • mto: This revision was merged to the branch mainline in revision 7036.
  • Revision ID: jelmer@jelmer.uk-20180708154710-zebexq602tcer8hv
Fix more merge tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/diff.py
483
483
 
484
484
 
485
485
def get_executable_change(old_is_x, new_is_x):
486
 
    descr = { True:"+x", False:"-x", None:"??" }
 
486
    descr = { True:b"+x", False:b"-x", None:b"??" }
487
487
    if old_is_x != new_is_x:
488
 
        return ["%s to %s" % (descr[old_is_x], descr[new_is_x],)]
 
488
        return [b"%s to %s" % (descr[old_is_x], descr[new_is_x],)]
489
489
    else:
490
490
        return []
491
491