~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-03-28 19:04:55 UTC
  • mfrom: (1626.1.1 bzr.mbp.integration)
  • Revision ID: pqm@pqm.ubuntu.com-20060328190455-9eab3a4045b61c4a
(mbp) disable break-lock until fixed properly

Show diffs side-by-side

added added

removed removed

Lines of Context:
2325
2325
                                 "don't break it"),
2326
2326
                    ]
2327
2327
    def run(self, location, show=False):
2328
 
        d = bzrdir.BzrDir.open(location)
2329
 
        repo = d.open_repository()
2330
 
        if not repo.is_locked():
2331
 
            raise errors.ObjectNotLocked(repo)
 
2328
        raise NotImplementedError("sorry, break-lock is not complete yet; "
 
2329
                "you can remove the 'held' directory manually to break the lock")
2332
2330
 
2333
2331
 
2334
2332
# command-line interpretation helper for merge-related commands