← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

More conflict handling, test porting

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
244
244
 
245
245
    def delete_contents(self, trans_id):
246
246
        """Schedule the contents of a path entry for deletion"""
 
247
        self.tree_kind(trans_id)
247
248
        self._removed_contents.add(trans_id)
248
249
 
249
250
    def cancel_deletion(self, trans_id):
1088
1089
                parent_id_winner = "other"
1089
1090
        if name_winner == "this" and parent_id_winner == "this":
1090
1091
            return
 
1092
        if name_winner == "conflict":
 
1093
            trans_id = self.tt.get_trans_id(file_id)
 
1094
            self.conflicts.append(('name conflict', trans_id, 
 
1095
                                  self.name(this_entry, file_id), 
 
1096
                                  self.name(other_entry, file_id)))
 
1097
        if parent_id_winner == "conflict":
 
1098
            trans_id = self.tt.get_trans_id(file_id)
 
1099
            self.conflicts.append(('parent conflict', trans_id, 
 
1100
                                   self.parent(this_entry, file_id), 
 
1101
                                   self.parent(other_entry, file_id)))
1091
1102
        if other_entry is None:
1092
1103
            # it doesn't matter whether the result was 'other' or 
1093
1104
            # 'conflict'-- if there's no 'other', we leave it alone.