version 1.155, 2008/06/14 04:34:08 |
version 1.156, 2008/07/08 12:29:58 |
|
|
{ |
{ |
BUF *bp; |
BUF *bp; |
mode_t mode; |
mode_t mode; |
int cf_kflag, exists, fd; |
int cf_kflag, exists; |
time_t rcstime; |
time_t rcstime; |
CVSENTRIES *ent; |
CVSENTRIES *ent; |
struct timeval tv[2]; |
struct timeval tv[2]; |
|
|
(void)unlink(cf->file_path); |
(void)unlink(cf->file_path); |
cvs_merge_file(cf, (cvs_join_rev1 == NULL)); |
cvs_merge_file(cf, (cvs_join_rev1 == NULL)); |
tosend = cf->file_path; |
tosend = cf->file_path; |
fd = cf->fd; |
|
} |
} |
|
|
if (co_flags & CO_COMMIT) |
if (co_flags & CO_COMMIT) |
|
|
cvs_remote_send_file_buf(cf->file_path, |
cvs_remote_send_file_buf(cf->file_path, |
bp, mode); |
bp, mode); |
} else { |
} else { |
cvs_remote_send_file(tosend, fd); |
cvs_remote_send_file(tosend, cf->fd); |
} |
} |
} |
} |
} |
} |