/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/test_commit_merge.py

  • Committer: Jelmer Vernooij
  • Date: 2011-09-27 11:34:38 UTC
  • mto: This revision was merged to the branch mainline in revision 6216.
  • Revision ID: jelmer@samba.org-20110927113438-iaunzmkn9yscv0al
More test fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_commit_merge.py
55
55
        wty.commit('merge from x', rev_id='y@u-0-2', allow_pointless=False)
56
56
 
57
57
        self.assertEquals(by.revno(), 3)
58
 
        self.assertEquals(list(by.iter_revision_history()),
59
 
                          [base_rev, 'y@u-0-1', 'y@u-0-2'])
 
58
        self.assertEquals(list(by.iter_reverse_revision_history()),
 
59
                          ['y@u-0-2', 'y@u-0-1', base_rev])
60
60
        rev = by.repository.get_revision('y@u-0-2')
61
61
        self.assertEquals(rev.parent_ids,
62
62
                          ['y@u-0-1', 'x@u-0-1'])