← 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: 2005-11-20 18:25:38 UTC
  • mto: (1185.50.1 jam-integration)
  • mto: This revision was merged to the branch mainline in revision 1518.
  • Revision ID: john@arbash-meinel.com-20051120182538-35c3c84165a794c7
Removed delayed setup, since it broke some tests. Fixed other small bugs. All tests pass.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
393
393
                                  "  Try merge.")
394
394
        if br_to.get_parent() is None or remember:
395
395
            br_to.set_parent(location)
396
 
        note('%d revision(s) pulled.' % (count,))
 
396
        if count:
 
397
            note('%d revision(s) pushed.' % (count,))
 
398
        else:
 
399
            note('No revisions pushed.')
397
400
 
398
401
        if verbose:
399
402
            new_rh = br_to.revision_history()
483
486
                                  "  Try a merge then push with overwrite.")
484
487
        if br_from.get_push_location() is None or remember:
485
488
            br_from.set_push_location(location)
486
 
        note('%d revision(s) pushed.' % (count,))
 
489
        if count:
 
490
            note('%d revision(s) pushed.' % (count,))
 
491
        else:
 
492
            note('No revisions pushed.')
487
493
 
488
494
        if verbose:
489
495
            new_rh = br_to.revision_history()