← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/weave_fmt/bzrdir.py

  • Committer: Jelmer Vernooij
  • Date: 2012-01-19 14:17:55 UTC
  • mfrom: (6437.3.11 2.5)
  • mto: (6437.3.14 2.5)
  • mto: This revision was merged to the branch mainline in revision 6444.
  • Revision ID: jelmer@samba.org-20120119141755-g0kmmvr2dcbb5r0v
Merge lp:bzr/2.5, resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/weave_fmt/bzrdir.py
927
927
                                        hardlink=hardlink)
928
928
        return result
929
929
 
 
930
    def set_branch_reference(self, target_branch, name=None):
 
931
        from bzrlib.branch import BranchReferenceFormat
 
932
        if name is not None:
 
933
            raise errors.NoColocatedBranchSupport(self)
 
934
        raise errors.IncompatibleFormat(BranchReferenceFormat, self._format)
 
935
 
930
936
 
931
937
class BzrDir4(BzrDirPreSplitOut):
932
938
    """A .bzr version 4 control object.