← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/push.py

  • Committer: Aaron Bentley
  • Date: 2008-08-28 19:35:29 UTC
  • mto: This revision was merged to the branch mainline in revision 3678.
  • Revision ID: aaron@aaronbentley.com-20080828193529-xk69k2ehmi3j2w05
Always show stacked message if stacking done.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/push.py
105
105
            revision_id=revision_id, stacked_on=stacked_on)
106
106
        br_to = dir_to.open_branch()
107
107
        # TODO: Some more useful message about what was copied
108
 
        if stacked_on is not None:
109
 
            note('Created new stacked branch referring to %s.' % stacked_on)
 
108
        try:
 
109
            finally_stacked_on = br_to.get_stacked_on_url()
 
110
        except (errors.UnstackableBranchFormat,
 
111
                errors.UnstackableRepositoryFormat,
 
112
                errors.NotStacked):
 
113
            finally_stacked_on = None
 
114
        if finally_stacked_on is not None:
 
115
            note('Created new stacked branch referring to %s.' %
 
116
                 finally_stacked_on)
110
117
        else:
111
118
            note('Created new branch.')
112
119
        # We successfully created the target, remember it