← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-04-28 11:52:52 UTC
  • mfrom: (5190.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20100428115252-dj0jg0on85ww9qoj
(vila) Don't mention --no-strict when we just issue the warning about
        unclean trees

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
1132
1132
        else:
1133
1133
            revision_id = None
1134
1134
        if tree is not None and revision_id is None:
1135
 
            tree.warn_if_changed_or_out_of_date(
1136
 
                strict, 'push_strict', 'Use --no-strict to force the push.')
 
1135
            tree.check_changed_or_out_of_date(
 
1136
                strict, 'push_strict',
 
1137
                more_error='Use --no-strict to force the push.',
 
1138
                more_warning='Uncommitted changes will not be pushed.')
1137
1139
        # Get the stacked_on branch, if any
1138
1140
        if stacked_on is not None:
1139
1141
            stacked_on = urlutils.normalize_url(stacked_on)