← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_branch.py

merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_branch.py
190
190
        format.set_branch_format(_mod_branch.BzrBranchFormat6())
191
191
        branch = self.make_branch('a', format=format)
192
192
        self.assertIsInstance(branch, _mod_branch.BzrBranch6)
193
 
        branch = self.make_branch('b', format='experimental-branch6')
 
193
        branch = self.make_branch('b', format='dirstate-with-subtree')
194
194
        self.assertIsInstance(branch, _mod_branch.BzrBranch6)
195
195
        branch = _mod_branch.Branch.open('a')
196
196
        self.assertIsInstance(branch, _mod_branch.BzrBranch6)
197
197
 
198
198
    def test_layout(self):
199
 
        branch = self.make_branch('a', format='experimental-branch6')
 
199
        branch = self.make_branch('a', format='dirstate-with-subtree')
200
200
        self.failUnlessExists('a/.bzr/branch/last-revision')
201
201
        self.failIfExists('a/.bzr/branch/revision-history')
202
202
 
203
203
    def test_config(self):
204
204
        """Ensure that all configuration data is stored in the branch"""
205
 
        branch = self.make_branch('a', format='experimental-branch6')
 
205
        branch = self.make_branch('a', format='dirstate-with-subtree')
206
206
        branch.set_parent('http://bazaar-vcs.org')
207
207
        self.failIfExists('a/.bzr/branch/parent')
208
208
        self.assertEqual('http://bazaar-vcs.org', branch.get_parent())
216
216
 
217
217
    def test_set_revision_history(self):
218
218
        tree = self.make_branch_and_memory_tree('.',
219
 
            format='experimental-branch6')
 
219
            format='dirstate-with-subtree')
220
220
        tree.lock_write()
221
221
        try:
222
222
            tree.add('.')
231
231
 
232
232
    def test_append_revision(self):
233
233
        tree = self.make_branch_and_tree('branch1',
234
 
            format='experimental-branch6')
 
234
            format='dirstate-with-subtree')
235
235
        tree.lock_write()
236
236
        try:
237
237
            tree.add('.')
257
257
            tree.unlock()
258
258
 
259
259
    def do_checkout_test(self, lightweight=False):
260
 
        tree = self.make_branch_and_tree('source', format='experimental-reference-dirstate')
261
 
        subtree = self.make_branch_and_tree('source/subtree', 
262
 
                                            format='experimental-reference-dirstate')
 
260
        tree = self.make_branch_and_tree('source', format='dirstate-with-subtree')
 
261
        subtree = self.make_branch_and_tree('source/subtree',
 
262
            format='dirstate-with-subtree')
263
263
        subsubtree = self.make_branch_and_tree('source/subtree/subsubtree',
264
 
                                               format='experimental-reference-dirstate')
 
264
            format='dirstate-with-subtree')
265
265
        self.build_tree(['source/subtree/file',
266
266
                         'source/subtree/subsubtree/file'])
267
267
        subsubtree.add('file')