← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Jelmer Vernooij
  • Date: 2012-02-02 14:29:12 UTC
  • mfrom: (6437.23.4 2.5)
  • mto: This revision was merged to the branch mainline in revision 6522.
  • Revision ID: jelmer@samba.org-20120202142912-3nmwuq16po3104u2
Merge 2.5.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
6473
6473
    def run(self, location=None):
6474
6474
        if location is None:
6475
6475
            location = "."
6476
 
        branch = Branch.open_containing(location)[0]
6477
 
        branch.bzrdir.destroy_branch()
 
6476
        cdir = controldir.ControlDir.open_containing(location)[0]
 
6477
        cdir.destroy_branch()
6478
6478
 
6479
6479
 
6480
6480
class cmd_shelve(Command):