← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Jelmer Vernooij
  • Date: 2012-01-19 16:23:53 UTC
  • mto: (6437.3.15 2.5)
  • mto: This revision was merged to the branch mainline in revision 6444.
  • Revision ID: jelmer@samba.org-20120119162353-c35bpl893up8k434
Fix remaining tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_update.py
194
194
 
195
195
        self.build_tree(['checkout1/'])
196
196
        checkout_dir = bzrdir.BzrDirMetaFormat1().initialize('checkout1')
197
 
        checkout_dir.set_branch_reference(master.branch)
 
197
        branch.BranchReferenceFormat().initialize(checkout_dir,
 
198
            target_branch=master.branch)
198
199
        checkout1 = checkout_dir.create_workingtree('m1')
199
200
 
200
201
        # Create a second branch, with an extra commit
250
251
 
251
252
        self.build_tree(['checkout1/'])
252
253
        checkout_dir = bzrdir.BzrDirMetaFormat1().initialize('checkout1')
253
 
        checkout_dir.set_branch_reference(master.branch)
 
254
        branch.BranchReferenceFormat().initialize(checkout_dir,
 
255
            target_branch=master.branch)
254
256
        checkout1 = checkout_dir.create_workingtree('m1')
255
257
 
256
258
        # Create a second branch, with an extra commit