← 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

  • Committer: Robey Pointer
  • Date: 2006-09-08 18:52:17 UTC
  • mfrom: (1993 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1996.
  • Revision ID: robey@lag.net-20060908185217-6a4406e1d41753f5
merge from bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_merge.py
194
194
        file('../bundle', 'wb').write(self.runbzr('bundle ../branch_a')[0])
195
195
        os.chdir('../branch_a')
196
196
        self.runbzr('merge ../bundle', retcode=1)
197
 
        testament_a = Testament.from_revision(tree_a.branch.repository, 
198
 
                                              tree_b.last_revision())
 
197
        testament_a = Testament.from_revision(tree_a.branch.repository,
 
198
                                              tree_b.get_parent_ids()[0])
199
199
        testament_b = Testament.from_revision(tree_b.branch.repository,
200
 
                                              tree_b.last_revision())
 
200
                                              tree_b.get_parent_ids()[0])
201
201
        self.assertEqualDiff(testament_a.as_text(),
202
202
                         testament_b.as_text())
203
203
        tree_a.set_conflicts(ConflictList())