← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Patch Queue Manager
  • Date: 2012-01-23 15:31:35 UTC
  • mfrom: (6443.1.1 bzr.dev)
  • Revision ID: pqm@pqm.ubuntu.com-20120123153135-8v3r3z1lx055vmpl
(jelmer) Merge the 2.5 series branch. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_status.py
598
598
    def make_branch_and_tree(self, relpath):
599
599
        source = self.make_branch(pathjoin('..', relpath))
600
600
        checkout = bzrdir.BzrDirMetaFormat1().initialize(relpath)
601
 
        bzrlib.branch.BranchReferenceFormat().initialize(checkout,
602
 
            target_branch=source)
 
601
        checkout.set_branch_reference(source)
603
602
        return checkout.create_workingtree()
604
603
 
605
604