← 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: 2016-02-01 19:13:13 UTC
  • mfrom: (6614.2.2 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20160201191313-wdfvmfff1djde6oq
(vila) Release 2.7.0 (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_revision.py
1
 
# Copyright (C) 2005-2011 Canonical Ltd
 
1
# Copyright (C) 2005-2011, 2016 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
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
    self.assertEqual(br2.last_revision(), 'b@u-0-4')
70
70
 
71
71
    tree1.merge_from_branch(br2)
72
72
    tree1.commit("Commit six", rev_id="a@u-0-3")
73
73
    tree1.commit("Commit seven", rev_id="a@u-0-4")
74
74
    tree2.commit("Commit eight", rev_id="b@u-0-5")
75
 
    self.assertEquals(br2.last_revision(), 'b@u-0-5')
 
75
    self.assertEqual(br2.last_revision(), 'b@u-0-5')
76
76
 
77
77
    tree1.merge_from_branch(br2)
78
78
    tree1.commit("Commit nine", rev_id="a@u-0-5")