![[BACK]](/icons/back.gif){kind=icon}
Return to checkout.c CVS log ![[TXT]](/icons/text.gif){kind=icon}
![[DIR]](/icons/dir.gif){kind=icon}
Up to [local] / src / usr.bin / cvs|
Return to checkout.c CVS log | Up to [local] / src / usr.bin / cvs |
| version 1.87, 2007/01/28 02:04:45 | version 1.88, 2007/01/28 23:39:42 | ||
|---|---|---|---|
|
|
||
| return; | return; | ||
| } | } | ||
| if (co_flags & CO_MERGE) | |||
| printf("merge on %s\n", cf->file_path); | |||
| if (cvs_server_active == 0) { | if (cvs_server_active == 0) { | ||
| if (!(co_flags & CO_MERGE)) { | if (!(co_flags & CO_MERGE)) { | ||
| oflags = O_WRONLY | O_TRUNC; | oflags = O_WRONLY | O_TRUNC; |