← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-02-01 03:46:12 UTC
  • mfrom: (3209.1.1 ianc-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20080201034612-xl88s8i45res3pm2
Make pull --quiet more quiet (James Westby)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
47
47
from progress import DummyProgress, ProgressPhase
48
48
from bzrlib.revision import (NULL_REVISION, ensure_null)
49
49
from bzrlib.textfile import check_text_lines
50
 
from bzrlib.trace import mutter, warning, note
 
50
from bzrlib.trace import mutter, warning, note, is_quiet
51
51
from bzrlib.transform import (TransformPreview, TreeTransform,
52
52
                              resolve_conflicts, cook_conflicts,
53
53
                              conflict_pass, FinalPaths, create_by_entry,
439
439
                self.base_tree.unlock()
440
440
            self.this_tree.unlock()
441
441
        if len(merge.cooked_conflicts) == 0:
442
 
            if not self.ignore_zero:
 
442
            if not self.ignore_zero and not is_quiet():
443
443
                note("All changes applied successfully.")
444
444
        else:
445
445
            note("%d conflicts encountered." % len(merge.cooked_conflicts))