Home
last modified time | relevance | path

Searched refs:ts_conflict (Results 1 – 11 of 11) sorted by relevance

/openbsd/gnu/usr.bin/cvs/src/
H A Dentries.c36 Entnode_Create(type, user, vn, ts, options, tag, date, ts_conflict) in Entnode_Create() argument
44 const char *ts_conflict;
57 ent->conflict = xstrdup (ts_conflict);
210 Register (list, fname, vn, ts, options, tag, date, ts_conflict) in Register() argument
218 char *ts_conflict;
235 ts_conflict ? "+" : "", ts_conflict ? ts_conflict : "",
240 ts_conflict);
298 char *tag_or_date, *tag, *date, *ts_conflict; local
366 if ((ts_conflict = strchr (ts, '+')))
367 *ts_conflict++ = '\0';
[all …]
H A Dvers_ts.c89 vers_ts->ts_conflict = xstrdup (entdata->conflict);
403 if ((*versp)->ts_conflict)
404 free ((*versp)->ts_conflict);
H A Dremove.c247 vers->tag, vers->date, vers->ts_conflict);
H A Dstatus.c155 if (vers->ts_conflict)
H A Dcvs.h595 char *options, char *tag, char *date, char *ts_conflict));
747 char *ts_conflict; member
H A Dclassify.c393 vers->options, vers->tag, vers->date, vers->ts_conflict);
H A Dupdate.c693 if (vers->ts_conflict)
706 retcode = vers->ts_conflict[0] != '=';
710 retcode = strcmp (vers->ts_conflict, filestamp);
715 retcode = strcmp (vers->ts_conflict, filestamp);
2354 vers->options, vers->tag, vers->date, vers->ts_conflict);
H A Dcommit.c865 if (status == T_MODIFIED && !force_ci && vers->ts_conflict)
878 retcode = vers->ts_conflict[0] != '=';
881 retcode = strcmp (vers->ts_conflict, filestamp);
886 retcode = strcmp (vers->ts_conflict, filestamp);
H A Dadd.c584 vers->tag, vers->date, vers->ts_conflict);
H A Dclient.c5208 if (vers->ts_conflict != NULL)
5211 strcmp (vers->ts_conflict, vers->ts_user) == 0)
H A DChangeLog-973055 T_MODIFIED and ts_conflict set, so that it doesn't say "unresolved