/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: 2018-11-16 18:35:30 UTC
  • mfrom: (7143.15.15 more-cleanups)
  • mto: This revision was merged to the branch mainline in revision 7178.
  • Revision ID: jelmer@jelmer.uk-20181116183530-ue8yx60h5tinl2wy
Merge more-cleanups.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/push.py
151
151
                                                 '  See "brz help diverged-branches"'
152
152
                                                 ' for more information.'))
153
153
        except errors.NoRoundtrippingSupport as e:
154
 
            raise errors.BzrCommandError(gettext("It is not possible to losslessly "
155
 
                                                 "push to %s. You may want to use dpush instead.") %
156
 
                                         e.target_branch.mapping.vcs.abbreviation)
 
154
            raise errors.BzrCommandError(
 
155
                gettext("It is not possible to losslessly "
 
156
                        "push to %s. You may want to use --lossy.") %
 
157
                    e.target_branch.mapping.vcs.abbreviation)
157
158
        except errors.NoRepositoryPresent:
158
159
            # we have a controldir but no branch or repository
159
160
            # XXX: Figure out what to do other than complain.