← 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: 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_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