← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_uncommit.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_uncommit.py
1
 
# Copyright (C) 2008 Canonical Ltd
 
1
# Copyright (C) 2008, 2009, 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
117
117
        tree.merge_from_branch(copy.branch)
118
118
        tree.branch.tags.set_tag('pointsatmerged', 'merged')
119
119
        history.append(tree.commit('merge'))
120
 
        self.assertEquals('merged', tree.branch.tags.lookup_tag('pointsatmerged'))
 
120
        self.assertEqual('merged', tree.branch.tags.lookup_tag('pointsatmerged'))
121
121
        self.assertEqual(history[2], tree.last_revision())
122
122
        self.assertEqual((3, history[2]), tree.branch.last_revision_info())
123
123
        tree.branch.tags.set_tag(u"pointsatexisting", history[1])
125
125
        uncommit.uncommit(tree.branch, tree=tree)
126
126
        self.assertEqual(history[1], tree.last_revision())
127
127
        self.assertEqual((2, history[1]), tree.branch.last_revision_info())
128
 
        self.assertEquals([history[1], 'merged'], tree.get_parent_ids())
 
128
        self.assertEqual([history[1], 'merged'], tree.get_parent_ids())
129
129
        self.assertEqual({
130
130
            "pointsatexisting": history[1],
131
131
            "pointsatmerged": 'merged',