← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

Merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
205
205
        f.close()
206
206
        tree_b.commit('message')
207
207
        os.chdir('branch_b')
208
 
        file('../bundle', 'wb').write(self.run_bzr('bundle ../branch_a')[0])
 
208
        self.run_bzr('bundle ../branch_a -o ../bundle')
209
209
        os.chdir('../branch_a')
210
210
        self.run_bzr('merge ../bundle', retcode=1)
211
211
        testament_a = Testament.from_revision(tree_a.branch.repository,