~bzr-pqm/bzr/bzr.dev

Committer: Patch Queue Manager
Date: 2012-01-31 16:10:49 UTC
mfrom: (6437.22.5 destroy-no-such-branch)
mto: (6437.54.1 2.5) (6457.1.1 trunk) (6159.2.7 bzr) (6461.1.1 trunk) (6468.1.1 merge-2.5) (6093.4.72 translations) (6472.1.1 merge-2.5) (6474.1.1 trunk) (6476.1.1 dev_2.5_integration) (6492.1.1 trunk) (6498.1.1 trunk) (6507.1.1 trunk) (6524.1.1 bzr.dev) (6531.1.1 merge-2.5) (6548.1.1 trunk) (6549.3.1 dev_2.5_integration) (6562.1.1 2.6-merge-up-2.5) (6574.1.1 integration) (6576.1.4 trunk) (6578.1.1 2.6-merges-2.5)
mto: This revision was merged to the branch mainline in revision 6458.
Revision ID: pqm@pqm.ubuntu.com-20120131161049-cz8sy2sy2g0vk356

(jelmer) Raise NotBranchError from BzrDir.destroy_branch. (Jelmer Vernooij)

added added

removed removed

159

bzrdir.create_branch()

160

bzrdir.open_branch()

161

162

def test_destroy_branch_no_branch(self):

163

branch = self.make_repository('branch')

164

bzrdir = branch.bzrdir

165

try:

166

self.assertRaises(errors.NotBranchError, bzrdir.destroy_branch)

167

except (errors.UnsupportedOperation, errors.TransportNotPossible):

168

raise TestNotApplicable('Format does not support destroying branch')

169

162

170

def test_destroy_repository(self):

163

171

repo = self.make_repository('repository')

164

172

bzrdir = repo.bzrdir