[Top][All Lists]

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

-kk not working

From: Stephen Rasku
Subject: -kk not working
Date: Sat, 3 Feb 2001 00:24:46 -0800 (PST)

This appears to fail on both version 1.10.8 and 1.11.

When doing a merge:

        cvs update -kk -j base-tag -j branch-tag
I was still getting keywords expanded in the files.  This caused 
conflicts in numerous files.  I have been testing this against a 
static tag instead of the HEAD because the branch that was being 
merged has been manually fixed and checked in:

File: gen_type.h        Status: File had conflicts on merge
   Working revision:    1.2
   Repository revision: 1.2     
   Sticky Tag:          before-msg-lib-merge (revision: 1.2)
   Sticky Date:         (none)
   Sticky Options:      -kk    \
Even in files without conflicts regarding keywords the keywords are 
expanded.  For example:

         Version Number : $Revision: 1.2 $

instead of:

        Version Number  : $Revision$
Stephen Rasku                   E-mail: stephen@tgivan.com
Senior Software Engineer        Web:    http://www.pop-star.net/
TGI Technologies

reply via email to

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