← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/foreign.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/foreign.py
297
297
            source_branch = Branch.open(directory)
298
298
            source_wt = None
299
299
        if source_wt is not None:
300
 
            source_wt.warn_if_changed_or_out_of_date(
301
 
                strict, 'dpush_strict', 'Use --no-strict to force the push.')
 
300
            source_wt.check_changed_or_out_of_date(
 
301
                strict, 'dpush_strict',
 
302
                more_error='Use --no-strict to force the push.',
 
303
                more_warning='Uncommitted changes will not be pushed.')
302
304
        stored_loc = source_branch.get_push_location()
303
305
        if location is None:
304
306
            if stored_loc is None: