version 1.241, 2008/06/09 17:05:49 |
version 1.242, 2008/06/09 22:31:24 |
|
|
"in the repository but is " |
"in the repository but is " |
"locally modified", |
"locally modified", |
cf->file_path); |
cf->file_path); |
cf->file_status = FILE_CONFLICT; |
if (cvs_cmdop == CVS_OP_COMMIT) |
|
cf->file_status = FILE_UNLINK; |
|
else |
|
cf->file_status = FILE_CONFLICT; |
} else if (cvs_cmdop != CVS_OP_IMPORT) { |
} else if (cvs_cmdop != CVS_OP_IMPORT) { |
cvs_log(LP_NOTICE, |
cvs_log(LP_NOTICE, |
"%s is no longer in the " |
"%s is no longer in the " |
|
|
cf->file_status = FILE_MODIFIED; |
cf->file_status = FILE_MODIFIED; |
else |
else |
cf->file_status = FILE_UPTODATE; |
cf->file_status = FILE_UPTODATE; |
|
|
if (rcsnum_differ(cf->file_ent->ce_rev, |
if (rcsnum_differ(cf->file_ent->ce_rev, |
cf->file_rcsrev)) { |
cf->file_rcsrev)) { |
if (cf->file_status == FILE_MODIFIED) |
if (cf->file_status == FILE_MODIFIED) |
cf->file_status = FILE_MERGE; |
cf->file_status = FILE_MERGE; |
else |
else |
cf->file_status = FILE_PATCH; |
cf->file_status = FILE_PATCH; |
|
} else if (cf->file_ent->ce_conflict != NULL && |
|
cf->file_status != FILE_MODIFIED) { |
|
cf->file_status = FILE_CONFLICT; |
} |
} |
} |
} |
} |
} |