> Yes, the -ko seems to work in my test, but I don't know how it will help you > in merging in the delta you already have. You will only get the -ko by doing > an update (I think) and that is what is failing. I changed the files in the repository back to -ko (with cvs admin). As to my working copy, I can either patch the Entries files, or maybe use an explicit -k flag to update.