/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/push.py

  • Committer: Jelmer Vernooij
  • Date: 2017-07-30 23:53:38 UTC
  • mfrom: (6734.1.22 move-errors-more)
  • Revision ID: jelmer@jelmer.uk-20170730235338-25jy0lgifkyx796l
Merge lp:~jelmer/brz/move-errors-more.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/push.py
19
19
from __future__ import absolute_import
20
20
 
21
21
from . import (
 
22
    branch as _mod_branch,
22
23
    controldir,
23
24
    errors,
24
25
    revision as _mod_revision,
125
126
        # TODO: Some more useful message about what was copied
126
127
        try:
127
128
            push_result.stacked_on = br_to.get_stacked_on_url()
128
 
        except (errors.UnstackableBranchFormat,
 
129
        except (_mod_branch.UnstackableBranchFormat,
129
130
                errors.UnstackableRepositoryFormat,
130
131
                errors.NotStacked):
131
132
            push_result.stacked_on = None