[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: How to merge with -kk

From: Larry Jones
Subject: Re: How to merge with -kk
Date: Fri, 2 Nov 2007 14:10:10 -0400 (EDT)

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

reply via email to

[Prev in Thread] Current Thread [Next in Thread]