/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 bzrlib/tests/test_revert.py

Changes from review

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_revert.py
52
52
        tree.commit('empty tree')
53
53
        merge_target = tree.bzrdir.sprout('merge_target').open_workingtree()
54
54
        self.build_tree(['tree/new_file'])
 
55
 
 
56
        # newly-added files should not be deleted
55
57
        tree.add('new_file')
56
58
        basis_tree = tree.basis_tree()
57
59
        tree.revert([])
58
60
        self.failUnlessExists('tree/new_file')
 
61
 
 
62
        # unchanged files should be deleted
59
63
        tree.add('new_file')
60
64
        tree.commit('add new_file')
61
65
        tree.revert([], old_tree=basis_tree)
62
66
        self.failIfExists('tree/new_file')
 
67
        
 
68
        # files should be deleted if their changes came from merges
63
69
        merge_target.merge_from_branch(tree.branch)
64
70
        self.failUnlessExists('merge_target/new_file')
65
71
        merge_target.revert([])
66
72
        self.failIfExists('merge_target/new_file')
 
73
 
 
74
        # files should not be deleted if changed after a merge
67
75
        merge_target.merge_from_branch(tree.branch)
68
 
        new_file = open('merge_target/new_file', 'wb')
69
 
        try:
70
 
            new_file.write('new_contents')
71
 
        finally:
72
 
            new_file.close()
73
76
        self.failUnlessExists('merge_target/new_file')
 
77
        self.build_tree_contents([('merge_target/new_file', 'new_contents')])
74
78
        merge_target.revert([])
75
79
        self.failUnlessExists('merge_target/new_file')