Searched refs:xx_new_filename (Results 1 – 1 of 1) sorted by relevance
155 string xx_new_filename; member180 xx_new_filename(), in MergedFile()196 xx_new_filename(that.xx_new_filename), in MergedFile()304 file->xx_new_filename = Perforce::Where(file->translated, true); in do_merge()305 if (file->xx_new_filename == "") { in do_merge()324 filesToDelete.push_back(file->xx_new_filename); in do_merge()332 filesToDelete.push_back(file->xx_new_filename); in do_merge()336 filesToAdd.push_back(file->xx_new_filename); in do_merge()338 filesToEdit.push_back(file->xx_new_filename); in do_merge()362 if (file->xx_new_text != "" && file->xx_new_filename != "") { in do_merge()[all …]