Re: Small question on "CVS Diff"

Arthur Barrett wrote:
> Robert,
>
> What CVS/CVSNT server version are you using?
>
>> I am experiencing a minor inconvenience when I perform a "CVS Diff"
>> operation from the TCVS context menu - I am on Windows 7 x64
>> and using
>> the latest RC of TCVS (with the last bundled CVSNT client
>> package). The
>> project is primarily a Unix/Linux one, and so uses a different line
>> termination convention than is used locally.
>>
>> Even though I used the option during checkout to leave the original
>> line-endings intact, every time a new copy is downloaded from the CVS
>> server to perform the diff against my local copy, it always
>> gets Windows
>> line endings.
>>
>> I use WinMerge for diffs, and need to tell it ignore line ending
>> differences... while this works, it seems wrong, and doesn't let me
>> notice if I by accident edit a file with a tool that stuffs in some
>> lines with Windows termination.
>>
>> Is there a TCVS preference that I missed?
>
> Someone else will be able to help determine if there is a bug in
> TortoiseCVS - however I can help you by explaining the best practice for
> using unix files with CVSNT.
>
> Firstly - please read the FAQ:
> http://www.tortoisecvs.org/faq.html#brokenlineendings

Arthur,

Thanks for the excellent background links on the issue of different 
line-ending conventions and their handling by version control SW... 
perhaps I didn't phrase things the right way, but I think a careful 
reading of my question shows I am aware of the majority of the issues 
that could bite the unwary. ;)

I specifically am having trouble, not with checking out per se, and not 
with committing, but with a tree checked out from a Unix-based project 
repo - and I selected the "retain Unix line endings" option during the 
initial checkout, which seemed to work as intended.  The CVS server is 
whatever SourceForge uses.  The CVSNT client install is "2.5.05.3489".

Again, I am only experiencing difficulties with the "temporary checkout" 
or whatever it is called that is done when I select the "CVS Diff" 
operation from the TCVS context menu... in that instance, I am not asked 
what to do, but I would expect TCVS to consult the management info 
attached to my checked out folder and handle the download of the temp 
copy for diffing appropriately.

Since every diff I do in this way shows all lines as "changed", need to 
tell WinMerge to ignore line-ending differences to see what I actually 
have [intentionally] changed.

Robert Roessler

------------------------------------------------------------------------------
This SF.Net email is sponsored by the Verizon Developer Community
Take advantage of Verizon's best-in-class app development support
A streamlined, 14 day to market process makes app distribution fast and easy
Join now and get one step closer to millions of Verizon customers
http://p.sf.net/sfu/verizon-dev2dev