~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-02-26 03:15:58 UTC
  • mfrom: (4050.1.3 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20090226031558-1ubr618vdn4r5f07
(robertc) Fix race condition with branch hooks during cloning when
        the new branch is stacked. (Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
229
229
        #   make sure its content is available in the target repository
230
230
        #   clone it.
231
231
        if local_branch is not None:
232
 
            result_branch = local_branch.clone(result, revision_id=revision_id)
233
 
            if repository_policy is not None:
234
 
                repository_policy.configure_branch(result_branch)
 
232
            result_branch = local_branch.clone(result, revision_id=revision_id,
 
233
                repository_policy=repository_policy)
235
234
        try:
236
235
            # Cheaper to check if the target is not local, than to try making
237
236
            # the tree and fail.