~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_branch/test_branch.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-05-07 11:50:28 UTC
  • mfrom: (5147.4.7 more-colo)
  • Revision ID: pqm@pqm.ubuntu.com-20100507115028-tuuxmnormm8oetw6
(vila, for jelmer) Pass the colocated branch name along in more places,
        add extra tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
668
668
        this_branch = self.make_branch('this')
669
669
        other_branch = self.make_branch('other')
670
670
        try:
671
 
            this_branch._format.set_reference(this_branch.bzrdir, other_branch)
 
671
            this_branch._format.set_reference(this_branch.bzrdir, None,
 
672
                other_branch)
672
673
        except NotImplementedError:
673
674
            # that's ok
674
675
            pass