version 1.153, 2008/06/14 03:58:29 |
version 1.154, 2008/06/14 04:34:08 |
|
|
else |
else |
cf->file_status = FILE_CHECKOUT; |
cf->file_status = FILE_CHECKOUT; |
|
|
cf->file_rcsrev = rcs_head_get(cf->file_rcs); |
if ((cf->file_rcsrev = rcs_head_get(cf->file_rcs)) == NULL) |
|
fatal("no head revision in RCS file for %s", |
|
cf->file_path); |
|
|
/* might be a bit overkill */ |
/* might be a bit overkill */ |
if (cvs_server_active == 1) |
if (cvs_server_active == 1) |
cvs_server_clear_sticky(cf->file_wd); |
cvs_server_clear_sticky(cf->file_wd); |
} |
} |
|
|
if (print_stdout && cf->file_status != FILE_UNKNOWN && |
if (print_stdout) { |
!cf->file_rcs->rf_dead) { |
if (cf->file_status != FILE_UNKNOWN && cf->file_rcs != NULL && |
rcsnum_tostr(cf->file_rcsrev, rbuf, sizeof(rbuf)); |
cf->file_rcsrev != NULL && !cf->file_rcs->rf_dead) { |
if (verbosity > 1) { |
rcsnum_tostr(cf->file_rcsrev, rbuf, sizeof(rbuf)); |
cvs_log(LP_RCS, RCS_DIFF_DIV); |
if (verbosity > 1) { |
cvs_log(LP_RCS, "Checking out %s", cf->file_path); |
cvs_log(LP_RCS, RCS_DIFF_DIV); |
cvs_log(LP_RCS, "RCS: %s", cf->file_rpath); |
cvs_log(LP_RCS, "Checking out %s", |
cvs_log(LP_RCS, "VERS: %s", rbuf); |
cf->file_path); |
cvs_log(LP_RCS, "***************"); |
cvs_log(LP_RCS, "RCS: %s", cf->file_rpath); |
|
cvs_log(LP_RCS, "VERS: %s", rbuf); |
|
cvs_log(LP_RCS, "***************"); |
|
} |
|
cvs_checkout_file(cf, cf->file_rcsrev, tag, CO_DUMP); |
} |
} |
cvs_checkout_file(cf, cf->file_rcsrev, tag, CO_DUMP); |
|
return; |
return; |
} |
} |
|
|
|
|
if (cf->file_ent->ce_opts == NULL) { |
if (cf->file_ent->ce_opts == NULL) { |
if (kflag) |
if (kflag) |
cf->file_status = FILE_CHECKOUT; |
cf->file_status = FILE_CHECKOUT; |
} else { |
} else if (cf->file_rcs != NULL) { |
if (strlen(cf->file_ent->ce_opts) < 3) |
if (strlen(cf->file_ent->ce_opts) < 3) |
fatal("malformed option for file %s", |
fatal("malformed option for file %s", |
cf->file_path); |
cf->file_path); |
|
|
if (cf->file_ent != NULL) { |
if (cf->file_ent != NULL) { |
if (!rcsnum_cmp(cf->file_ent->ce_rev, rev2, 0)) |
if (!rcsnum_cmp(cf->file_ent->ce_rev, rev2, 0)) |
goto out; |
goto out; |
|
} |
|
|
|
if (cf->file_rcsrev == NULL) { |
|
cvs_printf("non-mergable file: %s has no head revision!\n", |
|
cf->file_path); |
|
goto out; |
} |
} |
|
|
if (rev1 == NULL || !strcmp(state1, RCS_STATE_DEAD)) { |
if (rev1 == NULL || !strcmp(state1, RCS_STATE_DEAD)) { |