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

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_revert.py
1
 
# Copyright (C) 2005 Canonical Ltd
 
1
# Copyright (C) 2005, 2007 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
186
186
        out, err = self.run_bzr('revert -r -2')
187
187
        self.assertEqual('', out)
188
188
        self.assertEqual('-D  file\n', err)
 
189
 
 
190
    def test_revert_forget_merges(self):
 
191
        # revert --forget-merges removes any pending merges into the tree, but
 
192
        # leaves the files unchanged
 
193
        tree = self.make_branch_and_tree('.')
 
194
        # forget-merges before first commit, though pointless, does not fail
 
195
        self.run_bzr(['revert', '--forget-merges'])
 
196
        self.build_tree(['file'])
 
197
        first_rev_id = tree.commit('initial commit')
 
198
        self.build_tree_contents([('file', 'new content')])
 
199
        existing_parents = tree.get_parent_ids()
 
200
        self.assertEquals([first_rev_id], existing_parents)
 
201
        merged_parents = existing_parents + ['merged-in-rev']
 
202
        tree.set_parent_ids(merged_parents)
 
203
        self.assertEquals(merged_parents, tree.get_parent_ids())
 
204
        self.run_bzr(['revert', '--forget-merges'])
 
205
        self.assertEquals([first_rev_id], tree.get_parent_ids())
 
206
        # changed files are not reverted
 
207
        self.assertFileEqual('new content', 'file')
 
208
        # you can give it the path of a tree
 
209
        self.run_bzr(['revert', '--forget-merges', tree.abspath('.')])