← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

Deleted old pre-conflict contents

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
1045
1045
                parent_id = self.tt.final_parent(trans_id)
1046
1046
                if file_id in self.this_tree.inventory:
1047
1047
                    self.tt.unversion_file(trans_id)
 
1048
                    self.tt.delete_contents(trans_id)
1048
1049
                file_group = self._dump_conflicts(name, parent_id, file_id, 
1049
1050
                                                  set_version=True)
1050
1051