← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/controldir.py

  • Committer: Patch Queue Manager
  • Date: 2012-01-23 15:31:35 UTC
  • mfrom: (6443.1.1 bzr.dev)
  • Revision ID: pqm@pqm.ubuntu.com-20120123153135-8v3r3z1lx055vmpl
(jelmer) Merge the 2.5 series branch. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/controldir.py
230
230
            raise errors.NoColocatedBranchSupport(self)
231
231
        return None
232
232
 
 
233
    def set_branch_reference(self, target_branch, name=None):
 
234
        """Set the referenced URL for the branch in this controldir.
 
235
 
 
236
        :param name: Optional colocated branch name
 
237
        :param target_branch: Branch to reference
 
238
        :raises NoColocatedBranchSupport: If a branch name was specified
 
239
            but colocated branches are not supported.
 
240
        :return: The referencing branch
 
241
        """
 
242
        raise NotImplementedError(self.set_branch_reference)
 
243
 
233
244
    def open_branch(self, name=None, unsupported=False,
234
245
                    ignore_fallbacks=False, possible_transports=None):
235
246
        """Open the branch object at this ControlDir if one is present.