/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/per_repository_reference/test_fetch.py

  • Committer: Jelmer Vernooij
  • Date: 2018-06-21 17:53:38 UTC
  • mfrom: (6973.5.13 python3-c)
  • Revision ID: jelmer@jelmer.uk-20180621175338-v7loaib7mh7pfosf
Merge lp:~jelmer/brz/python3-c

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_repository_reference/test_fetch.py
87
87
        transport = self.make_smart_server('server')
88
88
        transport.ensure_base()
89
89
        url = transport.abspath('')
90
 
        stack_b = source_b.controldir.sprout(url + '/stack-on', revision_id='B-id')
 
90
        stack_b = source_b.controldir.sprout(url + '/stack-on', revision_id=b'B-id')
91
91
        # self.make_branch only takes relative paths, so we do it the 'hard'
92
92
        # way
93
93
        target_transport = transport.clone('target')
107
107
        # revision_id versus not. If you supply revision_id, then you get a
108
108
        # PendingAncestryResult for the search, versus a SearchResult...
109
109
        final2_b = target_b.controldir.sprout('final2',
110
 
                                          revision_id='C-id').open_branch()
 
110
                                          revision_id=b'C-id').open_branch()
111
111
        self.assertEqual('C-id', final_b.last_revision())
112
112
 
113
113
    def make_source_with_ghost_and_stacked_target(self):
116
116
        builder.build_snapshot(None, [
117
117
            ('add', ('', 'root-id', 'directory', None)),
118
118
            ('add', ('file', 'file-id', 'file', 'content\n'))],
119
 
            revision_id='A-id')
120
 
        builder.build_snapshot(['A-id', 'ghost-id'], [], revision_id='B-id')
 
119
            revision_id=b'A-id')
 
120
        builder.build_snapshot(['A-id', 'ghost-id'], [], revision_id=b'B-id')
121
121
        builder.finish_series()
122
122
        source_b = builder.get_branch()
123
123
        source_b.lock_read()