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.84 and 1.85

version 1.84, 2007/01/12 23:32:01

version 1.85, 2007/01/13 15:45:59

Line 270

void

cvs_update_local(struct cvs_file *cf)

{

BUF *bp;

int ret, flags;

CVSENTRIES *entlist;

char rbuf[16];

Line 287

Line 286

return;

}

* the bp buffer will be released inside rcs_kwexp_buf,

* which is called from cvs_checkout_file().

flags = 0;

bp = NULL;

cvs_file_classify(cf, tag, 1);

if (cf->file_status == FILE_UPTODATE && cf->file_ent != NULL &&

Line 307

Line 301

cvs_printf("%s\nChecking out %s\n"

"RCS:\t%s\nVERS:\t%s\n***************\n",

RCS_DIFF_DIV, cf->file_path, cf->file_rpath, rbuf);

cvs_checkout_file(cf, cf->file_rcsrev, NULL, CO_DUMP);

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

return;

}

Line 340

Line 334

if (tag != NULL)

flags = CO_SETSTICKY;

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

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

cvs_printf("U %s\n", cf->file_path);

break;

case FILE_MERGE:

#if 0

cvs_diff3(cf->file_rcs, cf->file_path, cf->fd,

cf->file_ent->ce_rev, cf->file_rcsrev, 1);

if (bp == NULL)

fatal("cvs_update_local: failed to merge");

cvs_checkout_file(cf, cf->file_rcsrev, bp, CO_MERGE);

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

if (diff3_conflicts != 0) {

cvs_printf("C %s\n", cf->file_path);

Line 357

Line 350

update_clear_conflict(cf);

cvs_printf("M %s\n", cf->file_path);

}

#endif

break;

case FILE_UNLINK:

(void)unlink(cf->file_path);