← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Vincent Ladeuil
  • Date: 2012-02-01 08:25:41 UTC
  • mfrom: (6437.23.3 2.5)
  • mto: This revision was merged to the branch mainline in revision 6458.
  • Revision ID: v.ladeuil+lp@free.fr-20120201082541-73d2i8rqcjrsx4ds
Merge 2.5 branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
6452
6452
    def run(self, location=None):
6453
6453
        if location is None:
6454
6454
            location = "."
6455
 
        branch = Branch.open_containing(location)[0]
6456
 
        branch.bzrdir.destroy_branch()
 
6455
        cdir = controldir.ControlDir.open_containing(location)[0]
 
6456
        cdir.destroy_branch()
6457
6457
 
6458
6458
 
6459
6459
class cmd_shelve(Command):