/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/selftest/test_merge_core.py

  • Committer: Martin Pool
  • Date: 2005-08-30 01:35:40 UTC
  • Revision ID: mbp@sourcefrog.net-20050830013540-34e8996a86ba25fb
- rename FunctionalTest to TestCaseInTempDir

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/test_merge_core.py
1
1
import os
2
2
import unittest
3
3
 
4
 
from bzrlib.selftest import FunctionalTestCase, TestCase
 
4
from bzrlib.selftest import TestCaseInTempDir, TestCase
5
5
from bzrlib.branch import ScratchBranch, Branch
6
6
from bzrlib.errors import NotBranchError, NotVersionedError
7
7
 
467
467
                     builder.apply_changeset, cset)
468
468
        builder.cleanup()
469
469
 
470
 
class FunctionalMergeTest(FunctionalTestCase):
 
470
class FunctionalMergeTest(TestCaseInTempDir):
471
471
 
472
472
    def test_trivial_star_merge(self):
473
473
        """Test that merges in a star shape Just Work."""