← 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: Vincent Ladeuil
  • Date: 2012-02-14 17:22:37 UTC
  • mfrom: (6466 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6468.
  • Revision ID: v.ladeuil+lp@free.fr-20120214172237-7dv7er3n4uy8d5m4
Merge trunk

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
 
        branch.BranchReferenceFormat().initialize(checkout_dir,
198
 
            target_branch=master.branch)
 
197
        checkout_dir.set_branch_reference(master.branch)
199
198
        checkout1 = checkout_dir.create_workingtree('m1')
200
199
 
201
200
        # Create a second branch, with an extra commit
251
250
 
252
251
        self.build_tree(['checkout1/'])
253
252
        checkout_dir = bzrdir.BzrDirMetaFormat1().initialize('checkout1')
254
 
        branch.BranchReferenceFormat().initialize(checkout_dir,
255
 
            target_branch=master.branch)
 
253
        checkout_dir.set_branch_reference(master.branch)
256
254
        checkout1 = checkout_dir.create_workingtree('m1')
257
255
 
258
256
        # Create a second branch, with an extra commit