← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_revision.py

  • Committer: Patch Queue Manager
  • Date: 2011-09-08 11:01:15 UTC
  • mfrom: (6123.1.16 gpg-typo)
  • Revision ID: pqm@cupuasso-20110908110115-gbb9benwkdksvzk5
(jelmer) Fix a typo (invalid format identifier) in an error message in
 bzrlib.gpg. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_revision.py
66
66
    br2 = tree2.branch
67
67
    tree2.commit("Commit four", rev_id="b@u-0-3")
68
68
    tree2.commit("Commit five", rev_id="b@u-0-4")
69
 
    self.assertEquals(br2.last_revision(), 'b@u-0-4')
 
69
    revisions_2 = br2.revision_history()
 
70
    self.assertEquals(revisions_2[-1], 'b@u-0-4')
70
71
 
71
72
    tree1.merge_from_branch(br2)
72
73
    tree1.commit("Commit six", rev_id="a@u-0-3")
73
74
    tree1.commit("Commit seven", rev_id="a@u-0-4")
74
75
    tree2.commit("Commit eight", rev_id="b@u-0-5")
75
 
    self.assertEquals(br2.last_revision(), 'b@u-0-5')
 
76
    self.assertEquals(br2.revision_history()[-1], 'b@u-0-5')
76
77
 
77
78
    tree1.merge_from_branch(br2)
78
79
    tree1.commit("Commit nine", rev_id="a@u-0-5")