← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_remove_tree.py

  • Committer: Matt Nordhoff
  • Date: 2009-04-04 02:50:01 UTC
  • mfrom: (4253 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4256.
  • Revision ID: mnordhoff@mattnordhoff.com-20090404025001-z1403k0tatmc8l91
Merge bzr.dev, fixing conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_remove_tree.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
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
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
 
18
18
"""Black-box tests for bzr remove-tree."""
38
38
        os.chdir('branch1')
39
39
        self.run_bzr('remove-tree')
40
40
        self.failIfExists('foo')
41
 
    
 
41
 
42
42
    def test_remove_tree_original_branch_explicit(self):
43
43
        self.run_bzr('remove-tree branch1')
44
44
        self.failIfExists('branch1/foo')
49
49
        os.chdir('branch2')
50
50
        self.run_bzr('remove-tree')
51
51
        self.failIfExists('foo')
52
 
    
 
52
 
53
53
    def test_remove_tree_sprouted_branch_explicit(self):
54
54
        self.tree.bzrdir.sprout('branch2')
55
55
        self.failUnlessExists('branch2/foo')
64
64
        self.failIfExists('foo')
65
65
        os.chdir('..')
66
66
        self.failUnlessExists('branch1/foo')
67
 
    
 
67
 
68
68
    def test_remove_tree_checkout_explicit(self):
69
69
        self.tree.branch.create_checkout('branch2', lightweight=False)
70
70
        self.failUnlessExists('branch2/foo')
84
84
        self.failUnlessExists('foo')
85
85
        os.chdir('..')
86
86
        self.failUnlessExists('branch1/foo')
87
 
    
 
87
 
88
88
    def test_remove_tree_lightweight_checkout_explicit(self):
89
89
        self.tree.branch.create_checkout('branch2', lightweight=True)
90
90
        self.failUnlessExists('branch2/foo')