← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/push.py

  • Committer: Ian Clatworthy
  • Date: 2008-06-10 05:02:30 UTC
  • mto: (3221.20.2 branch.shallow)
  • mto: This revision was merged to the branch mainline in revision 3537.
  • Revision ID: ian.clatworthy@canonical.com-20080610050230-q6l2fbyvoeuclw1t
shallow -> stacked

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/push.py
123
123
        br_to = dir_to.open_branch()
124
124
        # TODO: Some more useful message about what was copied
125
125
        if reference is not None:
126
 
            note('Created new shallow branch referring to %s.' % reference)
 
126
            note('Created new stacked branch referring to %s.' % reference)
127
127
        else:
128
128
            note('Created new branch.')
129
129
        # We successfully created the target, remember it
141
141
        # We have a repository but no branch, copy the revisions, and then
142
142
        # create a branch.
143
143
        if reference is not None:
144
 
            warning("Ignoring request for a shallow branch as repository "
 
144
            warning("Ignoring request for a stacked branch as repository "
145
145
                    "already exists at the destination location.")
146
146
        repository_to.fetch(br_from.repository, revision_id=revision_id)
147
147
        br_to = br_from.clone(dir_to, revision_id=revision_id)
150
150
            br_from.set_push_location(br_to.base)
151
151
    else: # We have a valid to branch
152
152
        if reference is not None:
153
 
            warning("Ignoring request for a shallow branch as branch "
 
153
            warning("Ignoring request for a stacked branch as branch "
154
154
                    "already exists at the destination location.")
155
155
        # We were able to connect to the remote location, so remember it.
156
156
        # (We don't need to successfully push because of possible divergence.)