src/usr.bin/cvs/update.c - diff

Return to update.c CVS log

Up to [local] / src / usr.bin / cvs

Diff for /src/usr.bin/cvs/update.c between version 1.109 and 1.110

version 1.109, 2007/09/07 23:59:01

version 1.110, 2007/09/22 16:01:22

Line 121

if (print_stdout)

cvs_client_send_request("Argument -p");

if (cvs_specified_tag != NULL)

cvs_client_send_request("Argument -r%s",

cvs_specified_tag);

cr.enterdir = NULL;

cr.leavedir = NULL;

cr.fileproc = cvs_client_sendfile;

Line 151

Line 155

cvs_log(LP_TRACE, "cvs_update_enterdir(%s)", cf->file_path);

cvs_file_classify(cf, NULL);

cvs_file_classify(cf, cvs_directory_tag);

if (cf->file_status == DIR_CREATE && build_dirs == 1) {

cvs_mkpath(cf->file_path, cvs_specified_tag);

Line 176

Line 180

if (cvs_specified_tag != NULL)

cvs_write_tagfile(cf->file_path,

cvs_specified_tag, NULL, 0);

cvs_parse_tagfile(cf->file_path,

&cvs_specified_tag, NULL, NULL);

}

Line 303

Line 304

}

flags = 0;

cvs_file_classify(cf, cvs_specified_tag);

cvs_file_classify(cf, cvs_directory_tag);

if ((cf->file_status == FILE_UPTODATE ||

cf->file_status == FILE_MODIFIED) && cf->file_ent != NULL &&

Line 312

Line 313

cf->file_status = FILE_MERGE;

else

cf->file_status = FILE_CHECKOUT;

cf->file_rcsrev = rcs_head_get(cf->file_rcs);

/* might be a bit overkill */

Line 358

Line 360

case FILE_LOST:

case FILE_CHECKOUT:

case FILE_PATCH:

if (cvs_specified_tag != NULL)

if (cvs_directory_tag != NULL ||

(((cf->file_ent != NULL) && cf->file_ent->ce_tag != NULL) &&

(reset_stickies != 1)))

flags = CO_SETSTICKY;

cvs_checkout_file(cf, cf->file_rcsrev, flags);

Line 387

Line 391

cvs_ent_remove(entlist, cf->file_name);

cvs_ent_close(entlist, ENT_SYNC);

cvs_history_add(CVS_HISTORY_UPDATE_REMOVE, cf, NULL);

break;

case FILE_UPTODATE:

if (cvs_cmdop != CVS_OP_UPDATE)

break;

if (cvs_directory_tag != NULL && cf->file_rcs->rf_dead != 1)

cvs_checkout_file(cf, cf->file_rcsrev, CO_SETSTICKY);

break;

default:

break;