← 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: Martin Packman
  • Date: 2011-12-08 19:00:14 UTC
  • mto: This revision was merged to the branch mainline in revision 6359.
  • Revision ID: martin.packman@canonical.com-20111208190014-mi8jm6v7jygmhb0r
Use --include-duplicates for make update-pot which already combines multiple msgid strings prettily

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_uncommit.py
110
110
            "pointsatexisting": history[0]
111
111
            }, tree.branch.tags.get_tag_dict())
112
112
 
113
 
    def test_uncommit_remove_tags_keeps_pending_merges(self):
114
 
        tree, history = self.make_linear_tree()
115
 
        copy = tree.bzrdir.sprout('copyoftree').open_workingtree()
116
 
        copy.commit(message='merged', rev_id='merged')
117
 
        tree.merge_from_branch(copy.branch)
118
 
        tree.branch.tags.set_tag('pointsatmerged', 'merged')
119
 
        history.append(tree.commit('merge'))
120
 
        self.assertEquals('merged', tree.branch.tags.lookup_tag('pointsatmerged'))
121
 
        self.assertEqual(history[2], tree.last_revision())
122
 
        self.assertEqual((3, history[2]), tree.branch.last_revision_info())
123
 
        tree.branch.tags.set_tag(u"pointsatexisting", history[1])
124
 
        tree.branch.tags.set_tag(u"pointsatremoved", history[2])
125
 
        uncommit.uncommit(tree.branch, tree=tree)
126
 
        self.assertEqual(history[1], tree.last_revision())
127
 
        self.assertEqual((2, history[1]), tree.branch.last_revision_info())
128
 
        self.assertEquals([history[1], 'merged'], tree.get_parent_ids())
129
 
        self.assertEqual({
130
 
            "pointsatexisting": history[1],
131
 
            "pointsatmerged": 'merged',
132
 
            }, tree.branch.tags.get_tag_dict())
133
 
 
134
113
    def test_uncommit_keep_tags(self):
135
114
        tree, history = self.make_linear_tree()
136
115
        self.assertEqual(history[1], tree.last_revision())