/breezy/unstable

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/unstable

« back to all changes in this revision

Viewing changes to breezy/tests/per_branch/test_reconcile.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-24 01:39:33 UTC
  • mfrom: (3815.3776.6)
  • Revision ID: jelmer@jelmer.uk-20170524013933-ir4y4tqtrsiz2ka2
New upstream snapshot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
16
16
 
17
17
"""Tests for branch implementations - test reconcile() functionality"""
18
18
 
19
 
from bzrlib import errors, reconcile
20
 
from bzrlib.branch import BzrBranch
21
 
from bzrlib.symbol_versioning import deprecated_in
22
 
from bzrlib.tests.per_branch import TestCaseWithBranch
23
 
from bzrlib.tests import TestNotApplicable
 
19
from breezy import errors, reconcile
 
20
from breezy.branch import BzrBranch
 
21
from breezy.symbol_versioning import deprecated_in
 
22
from breezy.tests.per_branch import TestCaseWithBranch
 
23
from breezy.tests import TestNotApplicable
24
24
 
25
25
 
26
26
class TestBranchReconcile(TestCaseWithBranch):