← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/push.py

  • Committer: Martin Pool
  • Date: 2009-12-10 00:13:16 UTC
  • mto: This revision was merged to the branch mainline in revision 4884.
  • Revision ID: mbp@sourcefrog.net-20091210001316-w1l2jtek6v8iyg49
Mention GNU project in --version

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)
144
140
        except errors.NoRepositoryPresent:
145
141
            # we have a bzrdir but no branch or repository
146
142
            # XXX: Figure out what to do other than complain.