~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bzrdir.py

Committer: Patch Queue Manager
Date: 2012-01-27 20:46:27 UTC
mfrom: (6437.18.5 colo-branch-names-with-slashes)
mto: (6437.24.1 2.5.0-dev) (6159.2.5 bzr) (6450.1.1 bzr.dev) (6457.1.1 trunk) (6461.1.1 trunk) (6468.1.1 merge-2.5) (6093.4.72 translations) (6472.1.1 merge-2.5) (6474.1.1 trunk) (6476.1.1 dev_2.5_integration) (6492.1.1 trunk) (6498.1.1 trunk) (6507.1.1 trunk) (6524.1.1 bzr.dev) (6531.1.1 merge-2.5) (6548.1.1 trunk) (6549.3.1 dev_2.5_integration) (6562.1.1 2.6-merge-up-2.5) (6574.1.1 integration) (6576.1.4 trunk) (6578.1.1 2.6-merges-2.5)
mto: This revision was merged to the branch mainline in revision 6451.
Revision ID: pqm@pqm.ubuntu.com-20120127204627-l1k18d3chedgs3bu

(jelmer) Support forward slashes in colocated branch names. (Jelmer Vernooij)

files modified:
bzrlib/bzrdir.py

bzrlib/errors.py

bzrlib/tests/per_controldir_colo/test_supported.py

bzrlib/tests/test_bzrdir.py

doc/en/release-notes/bzr-2.5.txt

Show diffs side-by-side

added added

removed removed

bzrlib/tests/test_bzrdir.py

1450

self.assertRaises(errors.BzrError, converter.convert, tree.bzrdir,

1451

None)

1452

1453

def test_nested(self):

1454

tree = self.make_branch_and_tree('.', format='development-colo')

1455

tree.bzrdir.create_branch(name='foo')

1456

tree.bzrdir.create_branch(name='fool/bla')

1457

self.assertRaises(

1458

errors.ParentBranchExists, tree.bzrdir.create_branch,

1459

name='foo/bar')

1460

1461

def test_parent(self):

1462

tree = self.make_branch_and_tree('.', format='development-colo')

1463

tree.bzrdir.create_branch(name='fool/bla')

1464

tree.bzrdir.create_branch(name='foo/bar')

1465

self.assertRaises(

1466

errors.AlreadyBranchError, tree.bzrdir.create_branch,

1467

name='foo')

1468

1453

1469

1454

1470

class SampleBzrFormat(bzrdir.BzrFormat):

1455

1471

Older »