← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/push.py

  • Committer: Andrew Bennetts
  • Date: 2010-01-15 03:58:20 UTC
  • mfrom: (4963 +trunk)
  • mto: (4973.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4975.
  • Revision ID: andrew.bennetts@canonical.com-20100115035820-ilb3t36swgzq6v1l
Merge lp:bzr.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/push.py
137
137
            raise errors.BzrCommandError('These branches have diverged.'
138
138
                                    '  See "bzr help diverged-branches"'
139
139
                                    ' for more information.')
 
140
        except errors.NoRoundtrippingSupport, e:
 
141
            raise errors.BzrCommandError("It is not possible to losslessly "
 
142
                "push to %s. You may want to use dpush instead." % 
 
143
                    e.target_branch.mapping.vcs.abbreviation)
140
144
        except errors.NoRepositoryPresent:
141
145
            # we have a bzrdir but no branch or repository
142
146
            # XXX: Figure out what to do other than complain.