← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: John Arbash Meinel
  • Date: 2011-07-18 15:09:20 UTC
  • mfrom: (6015.3.5 2.4)
  • mto: This revision was merged to the branch mainline in revision 6032.
  • Revision ID: john@arbash-meinel.com-20110718150920-19l4k8i6djiiv0j3
Merge bzr/2.4 into bzr.dev. Resolve a release-notes (NEWS) conflict, in favor of putting
the 2.4 entry into 2.5 where it belonged.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
1293
1293
            if repository_policy is not None:
1294
1294
                repository_policy.configure_branch(result)
1295
1295
            self.copy_content_into(result, revision_id=revision_id)
1296
 
            master_branch = self.get_master_branch()
1297
 
            if master_branch is None:
 
1296
            master_url = self.get_bound_location()
 
1297
            if master_url is None:
1298
1298
                result.set_parent(self.bzrdir.root_transport.base)
1299
1299
            else:
1300
 
                result.set_parent(master_branch.bzrdir.root_transport.base)
 
1300
                result.set_parent(master_url)
1301
1301
        finally:
1302
1302
            result.unlock()
1303
1303
        return result