← Back to branch summary

~amanica/bzr/320119-log_exclusive_lower_bound

« back to all changes in this revision

Viewing changes to bzrlib/send.py

  • Committer: Vincent Ladeuil
  • Date: 2009-07-01 15:17:33 UTC
  • mto: (4498.2.2 integration)
  • mto: This revision was merged to the branch mainline in revision 4501.
  • Revision ID: v.ladeuil+lp@free.fr-20090701151733-i34hbbl7e2e1ta2o
Fixed as per John's review.

* bzrlib/tests/blackbox/test_send.py:
(load_tests): Delete spurious spaces in dict() definition.
(TestSendStrictWithChanges.setUp): Clarify the intent and mean of
the parametrization.

* bzrlib/send.py:
(send): Oops, fix the error messages.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/send.py
122
122
                changes = tree.changes_from(tree.basis_tree())
123
123
                if changes.has_changed() or len(tree.get_parent_ids()) > 1:
124
124
                    raise errors.UncommittedChanges(
125
 
                        tree, more='Use --no-strict to force the push.')
 
125
                        tree, more='Use --no-strict to force the send.')
126
126
                if tree.last_revision() != tree.branch.last_revision():
127
127
                    # The tree has lost sync with its branch, there is little
128
128
                    # chance that the user is aware of it but he can still force
129
129
                    # the push with --no-strict
130
130
                    raise errors.OutOfDateTree(
131
 
                        tree, more='Use --no-strict to force the push.')
 
131
                        tree, more='Use --no-strict to force the send.')
132
132
            revision_id = branch.last_revision()
133
133
        if revision_id == NULL_REVISION:
134
134
            raise errors.BzrCommandError('No revisions to submit.')