← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

Merge cleanup into first-try

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_find_merge_base.py
1
 
# Copyright (C) 2005 Canonical Ltd
 
1
# Copyright (C) 2006, 2007, 2009, 2010 Canonical Ltd
2
2
# -*- coding: utf-8 -*-
3
3
#
4
4
# This program is free software; you can redistribute it and/or modify
16
16
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
17
import os
18
18
 
19
 
from bzrlib.tests.blackbox import ExternalBase
20
 
 
21
 
 
22
 
class TestFindMergeBase(ExternalBase):
 
19
from bzrlib.tests import TestCaseWithTransport
 
20
 
 
21
 
 
22
class TestFindMergeBase(TestCaseWithTransport):
23
23
 
24
24
    def test_find_merge_base(self):
25
25
        a_tree = self.make_branch_and_tree('a')