~bzr-pqm/bzr/bzr.dev

Committer: Patch Queue Manager
Date: 2012-01-28 03:06:57 UTC
mfrom: (6437.21.13 2a-supports-colo)
mto: (6159.2.5 bzr) (6437.24.1 2.5.0-dev) (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-20120128030657-jeig9rj6gbh078ug

(jelmer) Merge colocated branch support back into the 2a format. (Jelmer
Vernooij)

added added

removed removed

1447

tree.bzrdir.create_branch(name="another-colocated-branch")

1448

converter = tree.bzrdir._format.get_converter(

1449

bzrdir.BzrDirMetaFormat1())

1450

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

1451

None)

1450

result = converter.convert(tree.bzrdir, bzrdir.BzrDirMetaFormat1())

1451

self.assertIsInstance(result._format, bzrdir.BzrDirMetaFormat1)

1452

1453

def test_nested(self):

1454

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