← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_fetch.py

merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_fetch.py
231
231
        br2 = Branch.open('br2')
232
232
        br1 = Branch.open('br1')
233
233
        wt2 = WorkingTree.open('br2').merge_from_branch(br1)
 
234
        br2.lock_read()
 
235
        self.addCleanup(br2.unlock)
234
236
        for rev_id, text in [('1-2', 'original from 1\n'),
235
237
                             ('1-3', 'agreement\n'),
236
238
                             ('2-1', 'contents in 2\n'),
264
266
 
265
267
    def test_weaves_are_retrieved_once(self):
266
268
        self.build_tree(("source/", "source/file", "target/"))
267
 
        wt = self.make_branch_and_tree('source')
 
269
        # This test depends on knit dasta storage.
 
270
        wt = self.make_branch_and_tree('source', format='dirstate-tags')
268
271
        branch = wt.branch
269
272
        wt.add(["file"], ["id"])
270
273
        wt.commit("added file")