Lines Matching refs:path_conflict
456 unsigned path_conflict:1; member
2417 ci->path_conflict = 1; in apply_directory_rename_modifications()
2568 side1->path_conflict = 1; in process_renames()
2569 side2->path_conflict = 1; in process_renames()
2582 base->path_conflict = 1; in process_renames()
2696 newinfo->path_conflict = 1; in process_renames()
2720 newinfo->path_conflict = 1; in process_renames()
3668 ci->merged.clean = !ci->df_conflict && !ci->path_conflict; in process_entry()
3808 !ci->df_conflict && !ci->path_conflict; in process_entry()
3846 assert(!ci->df_conflict && !ci->path_conflict); in process_entry()
3847 } else if (ci->path_conflict && in process_entry()
3867 ci->merged.clean = !ci->df_conflict && !ci->path_conflict; in process_entry()
3874 ci->merged.clean = !ci->path_conflict; in process_entry()