← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/controldir.py

  • Committer: Jelmer Vernooij
  • Date: 2012-01-18 17:46:57 UTC
  • mto: (6437.3.9 2.5)
  • mto: This revision was merged to the branch mainline in revision 6444.
  • Revision ID: jelmer@samba.org-20120118174657-ky8kr6dkhelqy07s
Update NEWS, tweak docstrings.

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, to_branch, name=None):
 
233
    def set_branch_reference(self, target_branch, name=None):
234
234
        """Set the referenced URL for the branch in this controldir.
235
235
 
236
236
        :param name: Optional colocated branch name
237
 
        :param to_branch: Branch to reference
 
237
        :param target_branch: Branch to reference
238
238
        :raises NoColocatedBranchSupport: If a branch name was specified
239
239
            but colocated branches are not supported.
 
240
        :return: The referencing branch
240
241
        """
241
242
        raise NotImplementedError(self.set_branch_reference)
242
243