[cvsnt] Re: CVSNT Diff fails

David Smith dwsmith at synopsys.com
Sat Jan 14 00:57:37 GMT 2006


One more piece of data. The workspace was created with -k+L.

David
"David Smith" <dwsmith at synopsys.com> wrote in message 
news:dq9gkk$gmg$1 at paris.nodomain.org...
> The problem is that This does cause a problem. It causes update to say the 
> file needs updated. I have about 100 files in this directory. They are all 
> checked in at the same time. The repository was created using CVS (not 
> CVSNT). So, I need the workspace files to be consistent with the 
> repository files. Looking at the files on both sides (repository and 
> workspace) there are no markers. It is being inserted by the server. I 
> have to get rid of this. How can? We have a whole suite of products that 
> we are recommending customers migrate from CVS to CVSNT and are doing are 
> final testing and this has broken our ability to use CVSNT.
>
> Recommendations?
>
> Regards
> David
>
> "Tony Hoyle" <tony.hoyle at march-hare.com> wrote in message 
> news:dq9g6g$gf2$1 at paris.nodomain.org...
>> David Smith wrote:
>>> I have tried both cvs with CVS Suite 2.5.02.2091 and cvs from CVSNT 
>>> 2.5.0.3.2151 and get the same error. This is running on Windows XP SP2 
>>> and client and server are on the same machine.
>>>
>>> When I use the command:
>>>
>>> C:/Program Files/CVSNT/cvs.exe -z9 -d :sspi:user:password at host:/Test 
>>> diff -k+L base_2280.ai_tblidx
>>>
>>> I get the following error:
>>>
>>> Index: base_2280.ai_tblidx
>>> ===================================================================
>>> RCS file: /Test/2280/base_2280.ai_tblidx,v
>>> retrieving revision 1.1
>>> diff -r1.1 base_2280.ai_tblidx
>>> 1c1
>>> < [TableIndex 1.4]
>>> ---
>>>
>>>>[TableIndex 1.4]
>>>
>> You're just seeing the unicode markers at the front of the file.
>>
>> Since your checked file doesn't seem to have them (Checked out 
>> using -k{UCS2-LE} I guess) the diff sees the difference between the 
>> Unicode with a BOM (which is the default) and the one in your sandbox.
>>
>> It's harmless enough & won't affect anything really.
>>
>> Tony
>
> 





More information about the cvsnt mailing list