/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/branch_implementations/test_branch.py

  • Committer: Aaron Bentley
  • Date: 2007-02-06 14:52:16 UTC
  • mfrom: (2266 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2268.
  • Revision ID: abentley@panoramicfeedback.com-20070206145216-fcpi8o3ufvuzwbp9
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/branch_implementations/test_branch.py
40
40
import bzrlib.revision
41
41
from bzrlib.tests import TestCase, TestCaseWithTransport, TestSkipped
42
42
from bzrlib.tests.bzrdir_implementations.test_bzrdir import TestCaseWithBzrDir
 
43
from bzrlib.tests.HttpServer import HttpServer
43
44
from bzrlib.trace import mutter
44
45
from bzrlib.transport import get_transport
45
 
from bzrlib.transport.http import HttpServer
46
46
from bzrlib.transport.memory import MemoryServer
47
47
from bzrlib.upgrade import upgrade
48
48
from bzrlib.workingtree import WorkingTree
87
87
        self.assertEquals(br.revision_history(), ["rev1",])
88
88
        br.append_revision("rev2", "rev3")
89
89
        self.assertEquals(br.revision_history(), ["rev1", "rev2", "rev3"])
 
90
        self.assertRaises(errors.ReservedId, br.append_revision, 'current:')
90
91
 
91
92
    def test_fetch_revisions(self):
92
93
        """Test fetch-revision operation."""
595
596
        branch.set_push_location('foo')
596
597
        local_path = urlutils.local_path_from_url(branch.base[:-1])
597
598
        self.assertFileEqual("[%s]\n"
598
 
                             "push_location = foo" % local_path,
 
599
                             "push_location = foo\n"
 
600
                             "push_location:policy = norecurse" % local_path,
599
601
                             fn)
600
602
 
601
603
    # TODO RBC 20051029 test getting a push location from a branch in a