Re: [Fwd: CVS, Cygwin, IDE and Emacs]

[Eric Siegerman]

On Tue, Jun 11, 2002 at 03:52:43PM -0700, Mike Ayers wrote:
> I still check the
> files in and out from Cygwin, but the text files now have DOS line ends
> instead of Unix.

Try using WinCVS or another of the GUI CVS clients, or even a
native command-line version, instead of Cygwin.  I think there's also a
setting somewhere in Cygwin that'll fix this.

> This is not really a problem, as I use the '-b' switch when
> diffing.

Well, it's not really "not really a problem", as you're
discovering :-)

> However, Cygwin CVS uses vi (Vim) as the editor for checkin comments
> (when I don't use -m),

I was going to tell you to use a natively compiled Vim instead of
a Cygwin one (e.g.  GVim, which is reasonably well integrated
with the Windows GUI -- it's what I edit with whenever I'm forced
to use Windows as more than a Telnet client), or to put "set
fileformat=dos" in your .vimrc.  But adding ^M's to the log
messages rather than removing them from the files themselves, is
not exactly an improvement....  So on second thought, don't do
either of those things :-)

> leaving Unix line ends on the comment lines, which CVS
> leaves as is.

You mean $Log$ log-message inclusions?  Don't use $Log$!  It's
evil even when things aren't misconfigured -- it guarantees
conflicts every time you merge from one branch to another.

This has been discussed here in more detail; search the list
archives.

> Emacs loads the file in Unix mode if even one line has a Unix
> line end, so I get hundreds of lines (all the ones I'm interested in) with ^M
> at the end.

One can disable Vim's file-format detection -- tell it to always
treat files as a particular format (the "fileformats" (plural)
option).  Can Emacs be similarly configured?

A bunch of possible kludges, but only one real solution -- get
CVS to stop putting ^M's in the repository.

--

|  | /\
|-_|/  >   Eric Siegerman, Toronto, Ont.        address@hidden
|  |  /
Anyone who swims with the current will reach the big music steamship;
whoever swims against the current will perhaps reach the source.
        - Paul Schneider-Esleben