~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/selftest/testfetch.py

[merge] refactoring of branch vs working tree, etc (robertc)

Show diffs side-by-side

added added

removed removed

Lines of Context:
151
151
        os.mkdir('br1')
152
152
        br1 = Branch.initialize('br1')
153
153
        self.build_tree_contents([('br1/file', 'original contents\n')])
154
 
        br1.add(['file'], ['this-file-id'])
 
154
        br1.working_tree().add(['file'], ['this-file-id'])
155
155
        br1.working_tree().commit(message='rev 1-1', rev_id='1-1')
156
156
        copy_branch(br1, 'br2')
157
157
        br2 = Branch.open('br2')
201
201
    def test_weaves_are_retrieved_once(self):
202
202
        self.build_tree(("source/", "source/file", "target/"))
203
203
        branch = Branch.initialize("source")
204
 
        branch.add(["file"], ["id"])
 
204
        branch.working_tree().add(["file"], ["id"])
205
205
        branch.working_tree().commit("added file")
206
206
        print >>open("source/file", 'w'), "blah"
207
207
        branch.working_tree().commit("changed file")