~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_revert.py

Merge description into dont-add-conflict-helpers

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2006 Canonical Ltd
 
1
# Copyright (C) 2006, 2007, 2009, 2010 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
157
157
        self.failUnlessExists('dir/file1')
158
158
        self.failIfExists('dir/file2')
159
159
        self.assertEqual('dir-id', tree.path2id('dir'))
 
160
 
 
161
    def test_revert_root_id_change(self):
 
162
        tree = self.make_branch_and_tree('.')
 
163
        tree.set_root_id('initial-root-id')
 
164
        self.build_tree(['file1'])
 
165
        tree.add(['file1'])
 
166
        tree.commit('first')
 
167
        tree.set_root_id('temp-root-id')
 
168
        self.assertEqual('temp-root-id', tree.get_root_id())
 
169
        tree.revert()
 
170
        self.assertEqual('initial-root-id', tree.get_root_id())