← 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: 2006-04-05 04:54:00 UTC
  • mto: (2027.1.2 revert-subpath-56549)
  • mto: This revision was merged to the branch mainline in revision 1647.
  • Revision ID: aaron.bentley@utoronto.ca-20060405045400-7b57a53ee7fdaab6
Moved and renamed conflict functions

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
22
22
 
23
23
import bzrlib
24
24
from bzrlib.branch import Branch
 
25
from bzrlib.conflicts import conflicts_to_strings
25
26
from bzrlib.delta import compare_trees
26
27
from bzrlib.errors import (BzrCommandError,
27
28
                           BzrError,
43
44
from bzrlib.symbol_versioning import *
44
45
from bzrlib.trace import mutter, warning, note
45
46
from bzrlib.transform import (TreeTransform, resolve_conflicts, cook_conflicts,
46
 
                              conflicts_strings, FinalPaths, create_by_entry,
47
 
                              unique_add)
 
47
                              FinalPaths, create_by_entry, unique_add)
48
48
import bzrlib.ui
49
49
 
50
50
# TODO: Report back as changes are merged in
371
371
            finally:
372
372
                child_pb.finished()
373
373
            self.cook_conflicts(fs_conflicts)
374
 
            for line in conflicts_strings(self.cooked_conflicts):
 
374
            for line in conflicts_to_strings(self.cooked_conflicts):
375
375
                warning(line)
376
376
            self.pp.next_phase()
377
377
            results = self.tt.apply()