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

  • Committer: Jelmer Vernooij
  • Date: 2017-05-21 18:10:28 UTC
  • mto: This revision was merged to the branch mainline in revision 6623.
  • Revision ID: jelmer@jelmer.uk-20170521181028-zn04pdfw0od9hfj3
Rename brzlib => breezy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_commit_merge.py
17
17
 
18
18
import os
19
19
 
20
 
from brzlib import (
 
20
from breezy import (
21
21
    check,
22
22
    osutils,
23
23
    )
24
 
from brzlib.errors import PointlessCommit
25
 
from brzlib.tests import (
 
24
from breezy.errors import PointlessCommit
 
25
from breezy.tests import (
26
26
    TestCaseWithTransport,
27
27
    )
28
 
from brzlib.tests.features import (
 
28
from breezy.tests.features import (
29
29
    SymlinkFeature,
30
30
    )
31
 
from brzlib.tests.matchers import RevisionHistoryMatches
 
31
from breezy.tests.matchers import RevisionHistoryMatches
32
32
 
33
33
 
34
34
class TestCommitMerge(TestCaseWithTransport):