/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/tests/test_diff.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-06-30 10:47:22 UTC
  • mfrom: (6973.9.5 python3-h)
  • Revision ID: breezy.the.bot@gmail.com-20180630104722-b2dwuvyepexok616
Fix some more tests on python3.

Merged from https://code.launchpad.net/~jelmer/brz/python3-h/+merge/348245

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_diff.py
564
564
        tree = self.make_branch_and_tree('tree')
565
565
 
566
566
        tt = transform.TreeTransform(tree)
567
 
        tt.new_file('a', tt.root, 'contents\n', 'a-id', True)
568
 
        tt.new_file('b', tt.root, 'contents\n', 'b-id', False)
569
 
        tt.new_file('c', tt.root, 'contents\n', 'c-id', True)
570
 
        tt.new_file('d', tt.root, 'contents\n', 'd-id', False)
571
 
        tt.new_file('e', tt.root, 'contents\n', 'control-e-id', True)
572
 
        tt.new_file('f', tt.root, 'contents\n', 'control-f-id', False)
 
567
        tt.new_file('a', tt.root, ['contents\n'], b'a-id', True)
 
568
        tt.new_file('b', tt.root, ['contents\n'], b'b-id', False)
 
569
        tt.new_file('c', tt.root, ['contents\n'], b'c-id', True)
 
570
        tt.new_file('d', tt.root, ['contents\n'], b'd-id', False)
 
571
        tt.new_file('e', tt.root, ['contents\n'], b'control-e-id', True)
 
572
        tt.new_file('f', tt.root, ['contents\n'], b'control-f-id', False)
573
573
        tt.apply()
574
574
        tree.commit('one', rev_id=b'rev-1')
575
575