/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

merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
1086
1086
def create_by_entry(tt, entry, tree, trans_id, lines=None, mode_id=None):
1087
1087
    """Create new file contents according to an inventory entry."""
1088
1088
    if entry.kind == "file":
1089
 
        if lines == None:
 
1089
        if lines is None:
1090
1090
            lines = tree.get_file(entry.file_id).readlines()
1091
1091
        tt.create_file(lines, trans_id, mode_id=mode_id)
1092
1092
    elif entry.kind == "symlink":
1326
1326
            trans_id = conflict[1]
1327
1327
            try:
1328
1328
                tt.cancel_deletion(trans_id)
1329
 
                new_conflicts.add((c_type, 'Not deleting', trans_id))
 
1329
                new_conflicts.add(('deleting parent', 'Not deleting', 
 
1330
                                   trans_id))
1330
1331
            except KeyError:
1331
1332
                tt.create_directory(trans_id)
1332
 
                new_conflicts.add((c_type, 'Created directory.', trans_id))
 
1333
                new_conflicts.add((c_type, 'Created directory', trans_id))
1333
1334
        elif c_type == 'unversioned parent':
1334
1335
            tt.version_file(tt.inactive_file_id(conflict[1]), conflict[1])
1335
1336
            new_conflicts.add((c_type, 'Versioned directory', conflict[1]))