← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Robert Collins
  • Date: 2007-04-23 02:29:35 UTC
  • mfrom: (2441 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2442.
  • Revision ID: robertc@robertcollins.net-20070423022935-9hhongamvk6bfdso
Resolve conflicts with bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_bound_branches.py
103
103
        self.run_bzr('unbind', retcode=3)
104
104
 
105
105
    def test_bind_branch6(self):
106
 
        branch1 = self.make_branch('branch1', format='dirstate-with-subtree')
 
106
        branch1 = self.make_branch('branch1', format='dirstate-tags')
107
107
        os.chdir('branch1')
108
108
        error = self.run_bzr('bind', retcode=3)[1]
109
109
        self.assertContainsRe(error, 'no previous location known')
115
115
        branch2.unbind()
116
116
 
117
117
    def test_rebind_branch6(self):
118
 
        self.setup_rebind('dirstate-with-subtree')
 
118
        self.setup_rebind('dirstate-tags')
119
119
        os.chdir('branch2')
120
120
        self.run_bzr('bind')
121
121
        b = Branch.open('.')
128
128
        self.assertContainsRe(error, 'old locations')
129
129
 
130
130
    def init_meta_branch(self, path):
131
 
        format = bzrdir.format_registry.make_bzrdir('knit')
 
131
        format = bzrdir.format_registry.make_bzrdir('default')
132
132
        return BzrDir.create_branch_convenience(path, format=format)
133
133
 
134
134
    def test_bound_commit(self):