← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: John Arbash Meinel
  • Date: 2008-05-20 18:28:59 UTC
  • mto: This revision was merged to the branch mainline in revision 3441.
  • Revision ID: john@arbash-meinel.com-20080520182859-tvhy5hjx3jnlfzk6
Change the output to 'This branch' and 'Other branch', and document the text in NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
3379
3379
 
3380
3380
                if mine_only and not local_extra:
3381
3381
                    # We checked local, and found nothing extra
3382
 
                    self.outf.write('Local branch is up to date.\n')
 
3382
                    self.outf.write('This branch is up to date.\n')
3383
3383
                elif theirs_only and not remote_extra:
3384
3384
                    # We checked remote, and found nothing extra
3385
 
                    self.outf.write('Remote branch is up to date.\n')
 
3385
                    self.outf.write('Other branch is up to date.\n')
3386
3386
                elif not (mine_only or theirs_only or local_extra or
3387
3387
                          remote_extra):
3388
3388
                    # We checked both branches, and neither one had extra