Home
last modified time | relevance | path

Searched refs:FILE_CONFLICT (Results 1 – 6 of 6) sorted by relevance

/openbsd-src/usr.bin/cvs/
H A Dfile.h67 #define FILE_CONFLICT 10 macro
H A Drelease.c191 cf->file_status == FILE_CONFLICT) in release_check_files()
H A Dfile.c889 cf->file_status = FILE_CONFLICT; in cvs_file_classify()
907 cf->file_status = FILE_CONFLICT; in cvs_file_classify()
934 cf->file_status = FILE_CONFLICT; in cvs_file_classify()
H A Dadd.c460 case FILE_CONFLICT: in add_file()
H A Dupdate.c428 case FILE_CONFLICT: in cvs_update_local()
H A Dcommit.c335 if (cf->file_status == FILE_CONFLICT && in cvs_commit_check_files()