572
572
parent_id = self.tt.final_parent(trans_id)
573
573
if file_id in self.this_tree.inventory:
574
574
self.tt.unversion_file(trans_id)
577
576
file_group = self._dump_conflicts(name, parent_id, file_id,
579
578
self._raw_conflicts.append(('contents conflict', file_group))