Searched refs:ts_conflict (Results 1 – 7 of 7) sorted by relevance
| /mirbsd/src/gnu/usr.bin/cvs/src/ |
| D | entries.c | 40 const char *date, const char *ts_conflict) in Entnode_Create() argument
53 ent->conflict = xstrdup (ts_conflict); in Entnode_Create()
202 const char *ts_conflict) in Register() argument
210 server_register (fname, vn, ts, options, tag, date, ts_conflict); in Register()
216 ts_conflict ? "+" : "", ts_conflict ? ts_conflict : "", in Register()
220 ts_conflict); in Register()
273 char *tag_or_date, *tag, *date, *ts_conflict; in fgetentent() local
341 if ((ts_conflict = strchr (ts, '+'))) in fgetentent()
342 *ts_conflict++ = '\0'; in fgetentent()
373 ts_conflict); in fgetentent()
|
| D | classify.c | 288 vers->ts_conflict in Classify_File()
289 ? vers->ts_conflict : vers->ts_rcs)) in Classify_File()
303 else if (vers->ts_conflict) in Classify_File()
421 vers->options, vers->tag, vers->date, vers->ts_conflict); in sticky_ck()
|
| D | vers_ts.c | 103 vers_ts->ts_conflict = xstrdup (entdata->conflict); in Version_TS()
323 vers_ts->ts_conflict = xstrdup (""); in time_stamp_server()
460 if ((*versp)->ts_conflict) in freevers_ts()
461 free ((*versp)->ts_conflict); in freevers_ts()
|
| D | remove.c | 247 vers->options, vers->tag, vers->date, vers->ts_conflict); in remove_fileproc()
|
| D | cvs.h | 632 const char *ts_conflict);
751 char *ts_conflict; member
|
| D | client.c | 4475 if (vers->ts_conflict) in send_fileproc()
4477 if (vers->ts_user && !strcmp (vers->ts_conflict, vers->ts_user)) in send_fileproc()
4543 || strcmp (vers->ts_conflict in send_fileproc()
4544 ? vers->ts_conflict : vers->ts_rcs, vers->ts_user) in send_fileproc()
4545 || (vers->ts_conflict && !strcmp (cvs_cmd_name, "diff"))) in send_fileproc()
|
| D | update.c | 702 if (vers->ts_conflict) in update_fileproc()
2272 vers->options, vers->tag, vers->date, vers->ts_conflict); in join_file()
|