← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_rmbranch.py

  • Committer: Vincent Ladeuil
  • Date: 2010-10-08 10:50:51 UTC
  • mfrom: (5050.17.31 2.2.2-dev)
  • mto: This revision was merged to the branch mainline in revision 5474.
  • Revision ID: v.ladeuil+lp@free.fr-20101008105051-xd4knkrohzclffic
Merge 2.2 into trunk including fixes for bug #651706 and bug #646133

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_rmbranch.py
20
20
from bzrlib import (
21
21
    bzrdir,
22
22
    )
23
 
from bzrlib.tests.blackbox import (
24
 
    ExternalBase,
 
23
from bzrlib.tests import (
 
24
    TestCaseWithTransport,
25
25
    )
26
26
 
27
27
 
28
 
class TestRemoveBranch(ExternalBase):
 
28
class TestRemoveBranch(TestCaseWithTransport):
29
29
 
30
30
    def example_branch(self, path='.'):
31
31
        tree = self.make_branch_and_tree(path)