/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
206
206
        file('../bundle', 'wb').write(self.runbzr('bundle ../branch_a')[0])
207
207
        os.chdir('../branch_a')
208
208
        self.runbzr('merge ../bundle', retcode=1)
209
 
        testament_a = Testament.from_revision(tree_a.branch.repository, 
210
 
                                              tree_b.last_revision())
 
209
        testament_a = Testament.from_revision(tree_a.branch.repository,
 
210
                                              tree_b.get_parent_ids()[0])
211
211
        testament_b = Testament.from_revision(tree_b.branch.repository,
212
 
                                              tree_b.last_revision())
 
212
                                              tree_b.get_parent_ids()[0])
213
213
        self.assertEqualDiff(testament_a.as_text(),
214
214
                         testament_b.as_text())
215
215
        tree_a.set_conflicts(ConflictList())