version 1.134, 2008/02/09 17:01:43 |
version 1.135, 2008/02/09 20:04:00 |
|
|
struct timeval tv[2]; |
struct timeval tv[2]; |
struct tm *datetm; |
struct tm *datetm; |
char *tosend; |
char *tosend; |
char template[MAXPATHLEN], entry[CVS_ENT_MAXLINELEN]; |
char template[MAXPATHLEN], *entry; |
char kbuf[8], sticky[CVS_REV_BUFSZ], rev[CVS_REV_BUFSZ]; |
char kbuf[8], sticky[CVS_REV_BUFSZ], rev[CVS_REV_BUFSZ]; |
char timebuf[CVS_TIME_BUFSZ], tbuf[CVS_TIME_BUFSZ]; |
char timebuf[CVS_TIME_BUFSZ], tbuf[CVS_TIME_BUFSZ]; |
|
|
|
|
strlcpy(kbuf, cf->file_ent->ce_opts, sizeof(kbuf)); |
strlcpy(kbuf, cf->file_ent->ce_opts, sizeof(kbuf)); |
} |
} |
|
|
(void)xsnprintf(entry, CVS_ENT_MAXLINELEN, "/%s/%s/%s/%s/%s", |
entry = xmalloc(CVS_ENT_MAXLINELEN); |
cf->file_name, rev, timebuf, kbuf, sticky); |
cvs_ent_line_str(cf->file_name, rev, timebuf, kbuf, sticky, 0, 0, |
|
entry, CVS_ENT_MAXLINELEN); |
|
|
if (cvs_server_active == 0) { |
if (cvs_server_active == 0) { |
if (!(co_flags & CO_REMOVE) && cvs_cmdop != CVS_OP_EXPORT) { |
if (!(co_flags & CO_REMOVE) && cvs_cmdop != CVS_OP_EXPORT) { |
ent = cvs_ent_open(cf->file_wd); |
ent = cvs_ent_open(cf->file_wd); |
cvs_ent_add(ent, entry); |
cvs_ent_add(ent, entry); |
cvs_ent_close(ent, ENT_SYNC); |
cvs_ent_close(ent, ENT_SYNC); |
|
xfree(entry); |
} |
} |
} else { |
} else { |
if (co_flags & CO_MERGE) { |
if (co_flags & CO_MERGE) { |
|
|
else |
else |
cvs_server_update_entry("Updated", cf); |
cvs_server_update_entry("Updated", cf); |
|
|
if (!(co_flags & CO_REMOVE)) |
if (!(co_flags & CO_REMOVE)) { |
cvs_remote_output(entry); |
cvs_remote_output(entry); |
|
xfree(entry); |
|
} |
|
|
if (!(co_flags & CO_COMMIT) && !(co_flags & CO_REMOVE)) { |
if (!(co_flags & CO_COMMIT) && !(co_flags & CO_REMOVE)) { |
if (!(co_flags & CO_MERGE)) { |
if (!(co_flags & CO_MERGE)) { |