Re: How to merge with -kk

[Spiro Trikaliotis]

Hello Vince,

* On Fri, Nov 02, 2007 at 09:39:48AM -0700 Vince Rice wrote:
 
> So, how should this be done? I want to do a merge that ignores keyword
> errors, but that leaves keyword expansion working after the merge. Or
> at least know how to restore keyword expansion after the merge.

The keyword expansion still works, you only have the -kk sticky. You can
"reset" it by using "cvs update -A"; note, however, that this will also
remove any sticky tags (like the branch tag, if you are in the branch).

Thus, if you are in the bracn ABC, you might want to use "cvs up -A -r
ABC".

HTH,
   Spiro.

-- 
Spiro R. Trikaliotis                              http://opencbm.sf.net/
http://www.trikaliotis.net/                     http://www.viceteam.org/