~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: 2011-08-25 03:20:44 UTC
  • mfrom: (6045.2.1 fix-bug-250296)
  • Revision ID: pqm@pqm.ubuntu.com-20110825032044-1vtgcxhsmfyjqlj7
(mbp) clearer messages for 'bzr missing' (bug 250296) (Thomi Richards)

Show diffs side-by-side

added added

removed removed

Lines of Context:
4667
4667
 
4668
4668
        if mine_only and not local_extra:
4669
4669
            # We checked local, and found nothing extra
4670
 
            message('This branch is up to date.\n')
 
4670
            message('This branch has no new revisions.\n')
4671
4671
        elif theirs_only and not remote_extra:
4672
4672
            # We checked remote, and found nothing extra
4673
 
            message('Other branch is up to date.\n')
 
4673
            message('Other branch has no new revisions.\n')
4674
4674
        elif not (mine_only or theirs_only or local_extra or
4675
4675
                  remote_extra):
4676
4676
            # We checked both branches, and neither one had extra