Actually, I believe that was the first thing I tried. IIRC it didn't work, in that it removed the -kk, but it left the headers without the colon in them. But, now that you've confirmed that's the right way to do it, let me go try it again so I have facts instead of some vague recollections (it's been almost several days since this happened).
Thanks, Larry. ----- Original Message ---- From: Larry Jones <[EMAIL PROTECTED]> To: Vince Rice <[EMAIL PROTECTED]> Cc: [email protected] Sent: Friday, November 2, 2007 1:10:10 PM Subject: Re: How to merge with -kk 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 __________________________________________________ Do You Yahoo!? Tired of spam? Yahoo! Mail has the best spam protection around http://mail.yahoo.com
