← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/push.py

  • Committer: Vincent Ladeuil
  • Date: 2009-05-05 15:31:34 UTC
  • mto: (4343.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 4344.
  • Revision ID: v.ladeuil+lp@free.fr-20090505153134-q4bp4is9gywsmzrv
Clean up test for log formats.

* bzrlib/tests/blackbox/test_logformats.py:
Update tests to actual style.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/push.py
125
125
                    "already exists at the destination location.")
126
126
        try:
127
127
            push_result = dir_to.push_branch(br_from, revision_id, overwrite, 
128
 
                remember, create_prefix)
 
128
                remember)
129
129
        except errors.DivergedBranches:
130
130
            raise errors.BzrCommandError('These branches have diverged.'
131
 
                                    '  See "bzr help diverged-branches"'
132
 
                                    ' for more information.')
 
131
                                    '  Try using "merge" and then "push".')
133
132
        except errors.NoRepositoryPresent:
134
133
            # we have a bzrdir but no branch or repository
135
134
            # XXX: Figure out what to do other than complain.