![[BACK]](/icons/back.gif){kind=icon}
Return to file.c CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [local] / src / usr.bin / cvs|
Return to file.c CVS log | Up to [local] / src / usr.bin / cvs |
| version 1.203, 2007/10/05 19:28:23 | version 1.204, 2007/10/09 12:20:24 | ||
|---|---|---|---|
|
|
||
| "locally modified", | "locally modified", | ||
| cf->file_path); | cf->file_path); | ||
| cf->file_status = FILE_CONFLICT; | cf->file_status = FILE_CONFLICT; | ||
| } else { | } 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 " | ||
| "repository", | "repository", |