version 1.105, 2007/09/23 11:19:24 |
version 1.106, 2008/01/10 09:54:04 |
|
|
(cvs_server_active) ? "to client" : "to disk"); |
(cvs_server_active) ? "to client" : "to disk"); |
|
|
if (co_flags & CO_DUMP) { |
if (co_flags & CO_DUMP) { |
rcs_rev_write_fd(cf->file_rcs, rnum, STDOUT_FILENO, 1); |
rcs_rev_write_fd(cf->file_rcs, rnum, STDOUT_FILENO, 0); |
return; |
return; |
} |
} |
|
|
|
|
fatal("cvs_checkout_file: open: %s", |
fatal("cvs_checkout_file: open: %s", |
strerror(errno)); |
strerror(errno)); |
|
|
rcs_rev_write_fd(cf->file_rcs, rnum, cf->fd, 1); |
rcs_rev_write_fd(cf->file_rcs, rnum, cf->fd, 0); |
} else { |
} else { |
cvs_merge_file(cf, 1); |
cvs_merge_file(cf, 1); |
} |
} |