bug-cvs
[Top][All Lists]
Advanced

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

Re: -kk not working


From: Stephen Rasku
Subject: Re: -kk not working
Date: Sun, 4 Feb 2001 10:58:50 -0800 (PST)

I wrote:

>I wrote:
>
>>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:
>>
>
>Hmmmm... Looking at the merge from 1.10.8 it appears that all of the 
>conflicts except for one is valid.  There were other changes besides 
>the version number (adding a space, adding a return, changing keyword 
>from $Revision$ to $Id$, etc.)
>
>I will test tomorrow with 1.11 and re-verify my findings.
>

This problem is definitely happening with 1.11.

The conflicts I am getting are in different files than for 1.10.8 and 
they are only in the keywords.  The keywords haven't been modified 
like they have been for the 1.10.8 conflicts.  This looks serious.

-- 
Stephen Rasku                   E-mail: address@hidden
Senior Software Engineer        Web:    http://www.pop-star.net/
TGI Technologies




reply via email to

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