← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_interbranch/test_push.py

resolve conflicts against trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_interbranch/test_push.py
30
30
    check,
31
31
    errors,
32
32
    push,
33
 
    repository,
34
33
    symbol_versioning,
35
34
    tests,
 
35
    vf_repository,
36
36
    )
37
37
from bzrlib.branch import Branch
38
38
from bzrlib.bzrdir import BzrDir
287
287
    def disableOptimisticGetParentMap(self):
288
288
        # Tweak some class variables to stop remote get_parent_map calls asking
289
289
        # for or receiving more data than the caller asked for.
290
 
        self.overrideAttr(repository.InterRepository,
 
290
        self.overrideAttr(vf_repository.InterVersionedFileRepository,
291
291
                          '_walk_to_common_revisions_batch_size', 1)
292
292
        self.overrideAttr(SmartServerRepositoryGetParentMap,
293
293
                            'no_extra_results', True)