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

  • Committer: Jelmer Vernooij
  • Date: 2018-06-22 00:52:45 UTC
  • mfrom: (6973.7.4 python3-f)
  • Revision ID: jelmer@jelmer.uk-20180622005245-0q92vv00fy9ouyqv
Merge lp:~jelmer/brz/python3-f

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_fetch.py
245
245
        wt2 = WorkingTree.open('br2').merge_from_branch(br1)
246
246
        br2.lock_read()
247
247
        self.addCleanup(br2.unlock)
248
 
        for rev_id, text in [('1-2', 'original from 1\n'),
249
 
                             ('1-3', 'agreement\n'),
250
 
                             ('2-1', 'contents in 2\n'),
251
 
                             ('2-2', 'agreement\n')]:
 
248
        for rev_id, text in [(b'1-2', b'original from 1\n'),
 
249
                             (b'1-3', b'agreement\n'),
 
250
                             (b'2-1', b'contents in 2\n'),
 
251
                             (b'2-2', b'agreement\n')]:
252
252
            self.assertEqualDiff(
253
253
                br2.repository.revision_tree(
254
254
                    rev_id).get_file_text('file'), text)