Home
last modified time | relevance | path

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

/dragonfly/contrib/cvs-1.12/src/
H A Dclassify.c103 ret = T_CONFLICT; in Classify_File()
166 ret = T_CONFLICT; in Classify_File()
212 ret = T_CONFLICT; in Classify_File()
248 ret = T_CONFLICT; in Classify_File()
304 ret = T_CONFLICT; in Classify_File()
H A Dstatus.c142 case T_CONFLICT: in status_fileproc()
H A Dcommit.c798 else if (status == T_MODIFIED && xstatus == T_CONFLICT) in classify_file_internal()
820 if ((status == T_REMOVE_ENTRY || status == T_CONFLICT) in classify_file_internal()
903 case T_CONFLICT: in check_fileproc()
942 if (status == T_CONFLICT && !force_ci) in check_fileproc()
H A Dcvs.h794 T_CONFLICT, /* C (conflict) list */ enumerator
H A Dupdate.c640 case T_CONFLICT: /* old punt-type errors */ in update_fileproc()
668 case T_CONFLICT: /* old punt-type errors */ in update_fileproc()
H A Dtag.c575 case T_CONFLICT: in check_fileproc()