/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_interbranch/test_push.py

  • Committer: Jelmer Vernooij
  • Date: 2020-02-21 04:28:46 UTC
  • mfrom: (7494 work)
  • mto: This revision was merged to the branch mainline in revision 7496.
  • Revision ID: jelmer@jelmer.uk-20200221042846-r8lzqu0jetkw772i
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_interbranch/test_push.py
16
16
 
17
17
"""Tests for branch.push behaviour."""
18
18
 
 
19
from io import BytesIO
 
20
 
19
21
from testtools.matchers import (
20
22
    Equals,
21
23
    MatchesAny,
37
39
from ...controldir import ControlDir
38
40
from ...memorytree import MemoryTree
39
41
from ...revision import NULL_REVISION
40
 
from ...sixish import (
41
 
    BytesIO,
42
 
    )
43
42
from ...bzr.smart.repository import SmartServerRepositoryGetParentMap
44
43
from . import (
45
44
    TestCaseWithInterBranch,