~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
292
292
        self.assertEqualDiff(tree_a.branch.revision_history(),
293
293
                             tree_b.branch.revision_history())
294
294
 
295
 
        testament_a = Testament.from_revision(tree_a.branch.repository, 
296
 
                                              tree_a.last_revision())
 
295
        testament_a = Testament.from_revision(tree_a.branch.repository,
 
296
                                              tree_a.get_parent_ids()[0])
297
297
        testament_b = Testament.from_revision(tree_b.branch.repository,
298
 
                                              tree_b.last_revision())
 
298
                                              tree_b.get_parent_ids()[0])
299
299
        self.assertEqualDiff(testament_a.as_text(),
300
300
                             testament_b.as_text())
301
301