← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

Merged changes from transform

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
25
25
from bzrlib.inventory import InventoryEntry
26
26
from bzrlib.osutils import file_kind, supports_executable, pathjoin
27
27
from bzrlib.progress import DummyProgress
28
 
from bzrlib.trace import mutter
 
28
from bzrlib.trace import mutter, warning
29
29
 
30
30
 
31
31
ROOT_PARENT = "root-parent"
967
967
            cur_entry._read_tree_state(working_tree.id2path(file_id), 
968
968
                                       working_tree)
969
969
            contents_mod, meta_mod = entry.detect_changes(cur_entry)
 
970
            cur_entry._forget_tree_state()
970
971
    return has_contents, contents_mod, meta_mod
971
972
 
972
973
 
1001
1002
                continue
1002
1003
            if file_id not in target_tree:
1003
1004
                tt.unversion_file(tt.get_id_tree(file_id))
1004
 
        conflicts = resolve_conflicts(tt)
 
1005
        raw_conflicts = resolve_conflicts(tt)
 
1006
        for line in conflicts_strings(cook_conflicts(raw_conflicts, tt)):
 
1007
            warning(line)
1005
1008
        tt.apply()
1006
1009
    finally:
1007
1010
        tt.finalize()