← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Aaron Bentley
  • Date: 2008-03-03 16:52:41 UTC
  • mfrom: (3144.3.11 fix-conflict-handling)
  • mto: This revision was merged to the branch mainline in revision 3250.
  • Revision ID: aaron@aaronbentley.com-20080303165241-0k2c7ggs6kr9q6hf
Merge with fix-conflict-handling

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))
1290
1290
            for b_index in range(last_j, j):
1291
1291
                if b_index in new_b:
1292
1292
                    if b_index in killed_a:
1293
 
                        yield 'conflicted-b', self.lines_b[a_index]
 
1293
                        yield 'conflicted-b', self.lines_b[b_index]
1294
1294
                    else:
1295
1295
                        yield 'new-b', self.lines_b[b_index]
1296
1296
                else: