← 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: Canonical.com Patch Queue Manager
  • Date: 2010-03-11 13:47:06 UTC
  • mfrom: (5051.3.16 use-branch-open)
  • Revision ID: pqm@pqm.ubuntu.com-20100311134706-kaerqhx3lf7xn6rh
(Jelmer) Pass colocated branch names further down the call stack.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_workingtree/test_workingtree.py
423
423
        made_control = self.bzrdir_format.initialize('new')
424
424
        source.branch.repository.clone(made_control)
425
425
        source.branch.clone(made_control)
426
 
        made_tree = self.workingtree_format.initialize(made_control, revision_id='a')
 
426
        made_tree = self.workingtree_format.initialize(made_control,
 
427
            revision_id='a')
427
428
        self.assertEqual(['a'], made_tree.get_parent_ids())
428
429
 
429
430
    def test_update_sets_last_revision(self):
447
448
        # current format
448
449
        self.build_tree(['checkout/', 'tree/file'])
449
450
        checkout = bzrdir.BzrDirMetaFormat1().initialize('checkout')
450
 
        branch.BranchReferenceFormat().initialize(checkout, main_branch)
 
451
        branch.BranchReferenceFormat().initialize(checkout,
 
452
            target_branch=main_branch)
451
453
        old_tree = self.workingtree_format.initialize(checkout)
452
454
        # now commit to 'tree'
453
455
        wt.add('file')
514
516
        # current format
515
517
        self.build_tree(['checkout/', 'tree/file'])
516
518
        checkout = bzrdir.BzrDirMetaFormat1().initialize('checkout')
517
 
        branch.BranchReferenceFormat().initialize(checkout, main_branch)
 
519
        branch.BranchReferenceFormat().initialize(checkout,
 
520
            target_branch=main_branch)
518
521
        old_tree = self.workingtree_format.initialize(checkout)
519
522
        # now commit to 'tree'
520
523
        wt.add('file')