/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/test_uncommit.py

  • Committer: Jelmer Vernooij
  • Date: 2018-04-02 00:52:27 UTC
  • mfrom: (6939 work)
  • mto: This revision was merged to the branch mainline in revision 7274.
  • Revision ID: jelmer@jelmer.uk-20180402005227-pecflp1mvdjrjqd6
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_uncommit.py
51
51
        # The file should not be removed
52
52
        self.assertPathExists('tree/two')
53
53
        # And it should still be listed as added
54
 
        self.assertIsNot(None, tree.path2id('two'))
 
54
        self.assertTrue(tree.is_versioned('two'))
55
55
 
56
56
    def test_uncommit_bound(self):
57
57
        tree, history = self.make_linear_tree()
113
113
    def test_uncommit_remove_tags_keeps_pending_merges(self):
114
114
        tree, history = self.make_linear_tree()
115
115
        copy = tree.controldir.sprout('copyoftree').open_workingtree()
116
 
        copy.commit(message='merged', rev_id='merged')
 
116
        copy.commit(message='merged', rev_id=b'merged')
117
117
        tree.merge_from_branch(copy.branch)
118
118
        tree.branch.tags.set_tag('pointsatmerged', 'merged')
119
119
        history.append(tree.commit('merge'))