~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

  • Committer: Aaron Bentley
  • Date: 2008-08-27 20:41:03 UTC
  • mto: (3650.5.4 push)
  • mto: This revision was merged to the branch mainline in revision 3661.
  • Revision ID: aaron@aaronbentley.com-20080827204103-kjuwhyg2h74ktj79
Fix parent location when copying content

Show diffs side-by-side

added added

removed removed

Lines of Context:
1112
1112
        else:
1113
1113
            result_branch = source_branch.sprout(
1114
1114
                result, revision_id=_mod_revision.NULL_REVISION)
 
1115
            parent_location = result_branch.get_parent()
1115
1116
        mutter("created new branch %r" % (result_branch,))
1116
1117
        repository_policy.configure_branch(result_branch)
1117
1118
        if source_branch is not None:
1118
1119
            source_branch.copy_content_into(result_branch, revision_id)
 
1120
            result_branch.set_parent(parent_location)
1119
1121
 
1120
1122
        # Create/update the result working tree
1121
1123
        if isinstance(target_transport, LocalTransport) and (