/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

Added conflict warnings to revert

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
24
24
                           ExistingLimbo, ImmortalLimbo)
25
25
from bzrlib.inventory import InventoryEntry
26
26
from bzrlib.osutils import file_kind, supports_executable, pathjoin
27
 
from bzrlib.trace import mutter
 
27
from bzrlib.trace import mutter, warning
28
28
 
29
29
 
30
30
ROOT_PARENT = "root-parent"
993
993
                continue
994
994
            if file_id not in target_tree:
995
995
                tt.unversion_file(tt.get_id_tree(file_id))
996
 
        conflicts = resolve_conflicts(tt)
 
996
        raw_conflicts = resolve_conflicts(tt)
 
997
        for line in conflicts_strings(cook_conflicts(raw_conflicts, tt)):
 
998
            warning(line)
997
999
        tt.apply()
998
1000
    finally:
999
1001
        tt.finalize()