Vince Rice writes: > > Further investigation found that a "cvs status -v" showed the "-kk" in > the Sticky Options for every file that was merged. I then tried a few > things to get the -kk unstuck, including doing a cvs admin -kv on the > files.
The sticky option is in your working directory, not the repository. You have to do ``update -A'' to undo it, not muck with the repository. Even if it were wrong in the repository, you would still have to do ``update -A'' in your working directory after fixing the repository to pick up the change. -Larry Jones Oh, what the heck. I'll do it. -- Calvin
