/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 bzrlib/tests/blackbox/test_find_merge_base.py

  • Committer: Martin Pool
  • Date: 2010-10-08 04:38:25 UTC
  • mfrom: (5462 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5478.
  • Revision ID: mbp@sourcefrog.net-20101008043825-b181r8bo5r3qwb6j
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
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')