[cvsnt] key word avoid

[Harrison, Andrew]

Hi,

When you initially create the module you can specify certain files don't
expand keywords (-ko I think). Is there any way to add this option
retrospectively to a file that is already in the repository? I'm using
WinCVS v1.3.13.2 and CVS-NT v2.0.11.

Thanks,

Andy Harrison

Platform Software Engineer 
Anite Telecoms Ltd.
127 Fleet Road, 
Fleet, Hampshire, GU51 3QN, UK 
http://www.anite.com/telecoms


-----Original Message-----
From: Glen Starrett [mailto:grstarrett at cox.net]
Sent: 08 January 2004 17:09
To: 'yinzhaohui'; cvsnt at cvsnt.org
Subject: RE: [cvsnt] key word avoid


> I add a keyword $log$ in my source file, but when i merge two branch, 
> the log is always conflict,how to avoid ?

I *think* Tony fixed this in a recent version of CVSNT, take a look at the
history to be sure.  If you're using an earlier version though, the
recommended way to avoid the conflict is to not use $Log$ keyword.  That
info is available through the CVS LOG command anyway (I think that's the
jist of it, search the archives for the original thread).

Glen Starrett


_______________________________________________
cvsnt mailing list
cvsnt at cvsnt.org
http://www.cvsnt.org/cgi-bin/mailman/listinfo/cvsnt


Scanned for viruses by MessageLabs
Please note that my email domain has changed from @anitetelecoms.com to
@anite.com 
Registered in England No. 1721900 Registered Office: 353 Buckingham Avenue,
Slough, Berkshire SL1 4PF, United Kingdom 




________________________________________________________________________
This email has been scanned for all viruses by the MessageLabs Email
Security System. For more information on a proactive email security
service working around the clock, around the globe, visit
http://www.messagelabs.com
________________________________________________________________________