1
# Copyright (C) 2006 by Canonical Ltd
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
18
from bzrlib import merge, tests
21
class TestRevert(tests.TestCaseWithTransport):
22
"""Ensure that revert behaves as expected"""
24
def test_revert_merged_dir(self):
25
"""Reverting a merge that adds a directory deletes the directory"""
26
source_tree = self.make_branch_and_tree('source')
27
source_tree.commit('empty tree')
28
target_tree = source_tree.bzrdir.sprout('target').open_workingtree()
29
self.build_tree(['source/dir/', 'source/dir/contents'])
30
source_tree.add(['dir', 'dir/contents'], ['dir-id', 'contents-id'])
31
source_tree.commit('added dir')
32
merge.merge_inner(target_tree.branch, source_tree.basis_tree(),
33
target_tree.basis_tree(), this_tree=target_tree)
34
self.failUnlessExists('target/dir')
35
self.failUnlessExists('target/dir/contents')
36
target_tree.revert([])
37
self.failIfExists('target/dir/contents')
38
self.failIfExists('target/dir')
added
removed
bzrlib/tests/test_revert.py
