~bzr-pqm/bzr/bzr.dev

Viewing changes to bzrlib/branch.py

Committer: Patch Queue Manager
Date: 2012-01-27 14:56:06 UTC
mfrom: (6437.17.1 colocated-checkout-always-lightweight)
mto: (6437.24.1 2.5.0-dev) (6159.2.5 bzr) (6450.1.1 bzr.dev) (6457.1.1 trunk) (6461.1.1 trunk) (6468.1.1 merge-2.5) (6093.4.72 translations) (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 6451.
Revision ID: pqm@pqm.ubuntu.com-20120127145606-1t08tdt2ozzv4re5

(jelmer) Force lightweight checkouts for colocated branches. (Jelmer
Vernooij)

added added

removed removed

1469

pass

1470

else:

1471

raise errors.AlreadyControlDirError(t.base)

1472

if checkout.control_transport.base == self.bzrdir.control_transport.base:

1473

# When checking out to the same control directory,

1474

# always create a lightweight checkout

1475

lightweight = True

1472

1476

1473

1477

if lightweight:

1474

1478

from_branch = checkout.set_branch_reference(target_branch=self)