~bzr-pqm/bzr/bzr.dev

Committer: Patch Queue Manager
Date: 2012-02-20 12:02:45 UTC
mfrom: (6437.33.1 2.5)
mto: (6093.4.72 translations) (6437.54.1 2.5) (6472.1.1 merge-2.5) (6474.1.1 trunk) (6476.1.1 dev_2.5_integration) (6492.1.1 trunk) (6498.1.1 trunk) (6507.1.1 trunk) (6524.1.1 bzr.dev) (6531.1.1 merge-2.5) (6548.1.1 trunk) (6549.3.1 dev_2.5_integration) (6562.1.1 2.6-merge-up-2.5) (6574.1.1 integration) (6576.1.4 trunk) (6578.1.1 2.6-merges-2.5)
mto: This revision was merged to the branch mainline in revision 6473.
Revision ID: pqm@pqm.ubuntu.com-20120220120245-bvo53gwgx3n9lmw0

(jelmer) Allow control directories to provide colocated branch support but
not branch references. (Jelmer Vernooij)

added added

removed removed

145

def test_branch_reference(self):

146

referenced = self.make_branch('referenced')

147

repo = self.make_repository('repo')

148

repo.bzrdir.set_branch_reference(referenced, name='foo')

148

try:

149

repo.bzrdir.set_branch_reference(referenced, name='foo')

150

except errors.IncompatibleFormat:

151

raise tests.TestNotApplicable(

152

'Control dir does not support creating branch references.')

149

153

self.assertEquals(referenced.base,

150

154

repo.bzrdir.get_branch_reference('foo'))