← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_info.py

  • Committer: Jelmer Vernooij
  • Date: 2011-11-15 17:27:46 UTC
  • mfrom: (6260 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6263.
  • Revision ID: jelmer@samba.org-20111115172746-bznns2ohiexp2g5q
merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_info.py
1398
1398
         0 versioned subdirectories
1399
1399
""", out)
1400
1400
        self.assertEqual("", err)
 
1401
 
 
1402
    def test_info_shows_colocated_branches(self):
 
1403
        bzrdir = self.make_branch('.', format='development-colo').bzrdir
 
1404
        bzrdir.create_branch(name="colo1")
 
1405
        bzrdir.create_branch(name="colo2")
 
1406
        bzrdir.create_branch(name="colo3")
 
1407
        out, err = self.run_bzr('info -v .')
 
1408
        self.assertEqualDiff(
 
1409
"""Standalone branch (format: development-colo)
 
1410
Location:
 
1411
  branch root: .
 
1412
 
 
1413
Format:
 
1414
       control: Meta directory format 1 with support for colocated branches
 
1415
        branch: Branch format 7
 
1416
    repository: Repository format 2a - rich roots, group compression and chk inventories
 
1417
 
 
1418
Control directory:
 
1419
         4 branches
 
1420
 
 
1421
Branch history:
 
1422
         0 revisions
 
1423
 
 
1424
Repository:
 
1425
         0 revisions
 
1426
""", out)
 
1427
        self.assertEqual("", err)