← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Patch Queue Manager
  • Date: 2011-11-17 19:50:38 UTC
  • mfrom: (5268.8.23 switch-colocated)
  • Revision ID: pqm@pqm.ubuntu.com-20111117195038-1e3ypqmovs2bjhtp
(jelmer) Support switching to colocated branches in "bzr switch". (Jelmer
 Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
2470
2470
    def _get_config(self):
2471
2471
        return _mod_config.TransportConfig(self._transport, 'branch.conf')
2472
2472
 
2473
 
    def _get_config_store(self):
2474
 
        return _mod_config.BranchStore(self)
2475
 
 
2476
2473
    def is_locked(self):
2477
2474
        return self.control_files.is_locked()
2478
2475