← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_workingtree/test_workingtree.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/per_workingtree/test_workingtree.py
490
490
        # current format
491
491
        self.build_tree(['checkout/', 'tree/file'])
492
492
        checkout = bzrdir.BzrDirMetaFormat1().initialize('checkout')
493
 
        branch.BranchReferenceFormat().initialize(checkout,
494
 
            target_branch=main_branch)
 
493
        checkout.set_branch_reference(main_branch)
495
494
        old_tree = self.workingtree_format.initialize(checkout)
496
495
        # now commit to 'tree'
497
496
        wt.add('file')
558
557
        # current format
559
558
        self.build_tree(['checkout/', 'tree/file'])
560
559
        checkout = bzrdir.BzrDirMetaFormat1().initialize('checkout')
561
 
        branch.BranchReferenceFormat().initialize(checkout,
562
 
            target_branch=main_branch)
 
560
        checkout.set_branch_reference(main_branch)
563
561
        old_tree = self.workingtree_format.initialize(checkout)
564
562
        # now commit to 'tree'
565
563
        wt.add('file')