← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Jelmer Vernooij
  • Date: 2012-01-23 15:02:51 UTC
  • mfrom: (6437.3.19 2.5)
  • mto: This revision was merged to the branch mainline in revision 6444.
  • Revision ID: jelmer@samba.org-20120123150251-skmauxb1q7h6w31t
Merge 2.5 branch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_branches.py
17
17
 
18
18
"""Black-box tests for bzr branches."""
19
19
 
20
 
from bzrlib.branch import BranchReferenceFormat
21
20
from bzrlib.tests import TestCaseWithTransport
22
21
 
23
22
 
73
72
        t = self.make_repository('a', format='development-colo')
74
73
        t.bzrdir.create_branch(name='another')
75
74
        branch = t.bzrdir.create_branch(name='colocated')
76
 
        BranchReferenceFormat().initialize(t.bzrdir, target_branch=branch)
 
75
        t.bzrdir.set_branch_reference(target_branch=branch)
77
76
        out, err = self.run_bzr('branches a')
78
77
        self.assertEquals(out, "  another\n"
79
78
                               "* colocated\n")