Home
last modified time | relevance | path

Searched refs:ce_conflict (Results 1 – 7 of 7) sorted by relevance

/openbsd/usr.bin/cvs/
H A Dstatus.c158 cf->file_ent->ce_conflict != NULL) in cvs_status_local()
180 if (cf->file_ent->ce_conflict == NULL) { in cvs_status_local()
188 len = strlcpy(timebuf, cf->file_ent->ce_conflict, in cvs_status_local()
H A Dentries.c205 ent->ce_conflict = fields[3]; in cvs_ent_parse()
206 if ((dp = strchr(ent->ce_conflict, '+')) != NULL) in cvs_ent_parse()
209 ent->ce_conflict = NULL; in cvs_ent_parse()
H A Dupdate.c413 if (cf->file_ent->ce_conflict != NULL && ret == 1) in cvs_update_local()
416 if (cf->file_ent->ce_conflict != NULL && ret == 0) in cvs_update_local()
H A Dcvs.h248 char *ce_conflict; member
H A Dremote.c284 cf->file_ent->ce_conflict != NULL) in cvs_remote_classify_file()
H A Dcommit.c336 cf->file_ent->ce_conflict != NULL) { in cvs_commit_check_files()
344 cf->file_ent->ce_conflict != NULL && in cvs_commit_check_files()
H A Dclient.c487 if (cf->file_ent->ce_conflict == NULL) { in cvs_client_sendfile()
490 len = strlcpy(timebuf, cf->file_ent->ce_conflict, in cvs_client_sendfile()