[cvsnt] Re: Merging with keyword substitution

[Mike Lehmann]

Hi Tony,

To nail it down: if I do not use $Log$, CVSNT 2.0.58d should merge 
without causing merge conflicts in other keywords like $Revision$?

--
Mike


Tony Hoyle wrote:
> Mike Lehmann wrote:
> 
>> We are using SmartCVS as client and CVSNT 2.0.58d as server. Now we 
>> want to merge without getting keyword-conflicts. Is CVSNT smart enough 
>> (GNU CVS seems not to be) to ignore different keywords in different 
>> branches and not raise conflicts in each different keyword?
>>
> It tries to, but isn't always successful (works for me though.. YYMV).
> 
> $Log$ will pretty much always conflict, but that's unavoidable due to 
> its nature.
> 
> Tony