Re: Small question on "CVS Diff"

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

If you are using CVSNT server then you can specify some files as always
having DOS, Unix or Mac line endings (this feature was added since the
TortoiseCVS FAQ was written - anyone want to volunteer to update the
FAQ?):
http://www.cvsnt.org/manual/html/Substitution-modes.html

These previous posts about the topic may help you further (usually the
'next message' link will show you replies):
http://www.cvsnt.org/pipermail/cvsnt/2004-April/012238.html
And
http://www.cvsnt.org/pipermail/cvsnt/2004-February/010833.html

Also some history of the '--lf' undocumented option:
http://www.cvsnt.org/pipermail/cvsnt/2006-August/026498.html
And
http://www.cvsnt.org/pipermail/cvsnt/2006-September/027086.html

Those updates made to --lf in Sep 2006 are still in the latest 2.5.04
and 2.5.05 releases.

Regards,


Arthur Barrett




------------------------------------------------------------------------------
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