← 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: Jelmer Vernooij
  • Date: 2011-12-16 19:41:30 UTC
  • mto: This revision was merged to the branch mainline in revision 6433.
  • Revision ID: jelmer@samba.org-20111216194130-mp1js5unwj2e3nbz
https://launchpad.net/bugs/905462
Uncommit no longer removes tags if they are part of the working trees pending merges.

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
 
113
134
    def test_uncommit_keep_tags(self):
114
135
        tree, history = self.make_linear_tree()
115
136
        self.assertEqual(history[1], tree.last_revision())