← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_commit_merge.py

  • Committer: Vincent Ladeuil
  • Date: 2011-02-10 12:37:27 UTC
  • mto: This revision was merged to the branch mainline in revision 5661.
  • Revision ID: v.ladeuil+lp@free.fr-20110210123727-8e0pu4wtlt6fj7nf
thread is already a python module, avoid confusion and use cethread instead.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_commit_merge.py
89
89
 
90
90
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
91
91
        tree = by.repository.revision_tree('y@u-0-2')
92
 
        self.assertEquals(tree.get_file_revision('ecks-id'), 'x@u-0-1')
93
 
        self.assertEquals(tree.get_file_revision('why-id'), 'y@u-0-1')
 
92
        inv = tree.inventory
 
93
        self.assertEquals(inv['ecks-id'].revision, 'x@u-0-1')
 
94
        self.assertEquals(inv['why-id'].revision, 'y@u-0-1')
94
95
 
95
96
        check.check_dwim(bx.base, False, True, True)
96
97
        check.check_dwim(by.base, False, True, True)