← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branch.py

  • Committer: Jelmer Vernooij
  • Date: 2011-05-06 14:32:22 UTC
  • mfrom: (5835 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5844.
  • Revision ID: jelmer@samba.org-20110506143222-0xlujgere5v3zpx7
merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branch.py
1271
1271
            if repository_policy is not None:
1272
1272
                repository_policy.configure_branch(result)
1273
1273
            self.copy_content_into(result, revision_id=revision_id)
1274
 
            result.set_parent(self.bzrdir.root_transport.base)
 
1274
            master_branch = self.get_master_branch()
 
1275
            if master_branch is None:
 
1276
                result.set_parent(self.bzrdir.root_transport.base)
 
1277
            else:
 
1278
                result.set_parent(master_branch.bzrdir.root_transport.base)
1275
1279
        finally:
1276
1280
            result.unlock()
1277
1281
        return result