← 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: Martin Pool
  • Date: 2006-01-30 06:23:50 UTC
  • mfrom: (1534.1.17 integration)
  • Revision ID: mbp@sourcefrog.net-20060130062350-d6f25277ddcdfd79
[merge] robert's integration of much recent work

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_commit_merge.py
58
58
        self.assertEquals(by.revno(), 2)
59
59
        self.assertEquals(list(by.revision_history()),
60
60
                          ['y@u-0-1', 'y@u-0-2'])
61
 
        rev = by.get_revision('y@u-0-2')
 
61
        rev = by.repository.get_revision('y@u-0-2')
62
62
        self.assertEquals(rev.parent_ids,
63
63
                          ['y@u-0-1', 'x@u-0-1'])
64
64
 
89
89
                          specific_files=['ecks'])
90
90
        
91
91
        commit(by, 'merge from x', rev_id='y@u-0-2', allow_pointless=False)
92
 
        tree = by.revision_tree('y@u-0-2')
 
92
        tree = by.repository.revision_tree('y@u-0-2')
93
93
        inv = tree.inventory
94
94
        self.assertEquals(inv['ecks-id'].revision, 'x@u-0-1')
95
95
        self.assertEquals(inv['why-id'].revision, 'y@u-0-1')