From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Jason Rumney Newsgroups: gmane.emacs.help Subject: Re: NTEmacs, CVS, PCL-CVS, Version Control and ^M? Date: 24 Apr 2003 08:44:56 +0100 Organization: freedom2surf Sender: help-gnu-emacs-bounces+gnu-help-gnu-emacs=m.gmane.org@gnu.org Message-ID: <87ptnccpaf.fsf@nyaumo.jasonrumney.net> References: NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: main.gmane.org 1051248625 10644 80.91.224.249 (25 Apr 2003 05:30:25 GMT) X-Complaints-To: usenet@main.gmane.org NNTP-Posting-Date: Fri, 25 Apr 2003 05:30:25 +0000 (UTC) Original-X-From: help-gnu-emacs-bounces+gnu-help-gnu-emacs=m.gmane.org@gnu.org Fri Apr 25 07:30:20 2003 Return-path: Original-Received: from monty-python.gnu.org ([199.232.76.173]) by main.gmane.org with esmtp (Exim 3.35 #1 (Debian)) id 198vmu-0002lW-00 for ; Fri, 25 Apr 2003 07:30:20 +0200 Original-Received: from localhost ([127.0.0.1] helo=monty-python.gnu.org) by monty-python.gnu.org with esmtp (Exim 4.10.13) id 198vnI-0002kH-04 for gnu-help-gnu-emacs@m.gmane.org; Fri, 25 Apr 2003 01:30:44 -0400 Original-Path: shelby.stanford.edu!newsfeed.stanford.edu!news-spur1.maxwell.syr.edu!news.maxwell.syr.edu!newsfeed.icl.net!newsfeed.fjserv.net!diablo.theplanet.net!mephistopheles.news.clara.net!news.clara.net!news.freedom2surf.net!nyaumo.jasonrumney.net!news Original-Newsgroups: gnu.emacs.help Original-Lines: 25 Original-NNTP-Posting-Host: 195.137.103.251 Original-X-Trace: news.freedom2surf.net 1051248481 21901 195.137.103.251 (25 Apr 2003 05:28:01 GMT) Original-X-Complaints-To: abuse@freedom2surf.net Original-NNTP-Posting-Date: Fri, 25 Apr 2003 05:28:01 +0000 (UTC) X-Face: .PruP48JRO{Z6Rfz?YkZ>)zR+7!Up"`!1Cvq{fGd)@K; y]C:8r\CrJ^Mj\_U"9*WD2 I#zdK_#tw]y9*Y$?ge&b23Zt7zpknL{)F7Px4DVSY6b9dg[^VtkN-R_$YJ0cL''j[,}O#k{k| User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3.50 Original-Xref: shelby.stanford.edu gnu.emacs.help:112296 Original-To: help-gnu-emacs@gnu.org X-BeenThere: help-gnu-emacs@gnu.org X-Mailman-Version: 2.1b5 Precedence: list List-Id: Users list for the GNU Emacs text editor List-Help: List-Post: List-Subscribe: , List-Archive: List-Unsubscribe: , Errors-To: help-gnu-emacs-bounces+gnu-help-gnu-emacs=m.gmane.org@gnu.org Xref: main.gmane.org gmane.emacs.help:8795 X-Report-Spam: http://spam.gmane.org/gmane.emacs.help:8795 Galen Boyer writes: > We have a CVS server on a UNIX machine but, AFAIK, most of us are > committing our work from Windows machines. But, we also have a mix of > people using WINCVS and cygwin CVS command-line. I guess these people are the cause of the problem, since cygwin CVS and WinCVS treat line-ends differently. If you use a mixture of them, then you will get strange line ends in your files. It is better to use the command-line CVS that comes with WinCVS if you will be using WinCVS. > What I'd like to know is if anybody has any experience with odd behavior > from checking in and checking out code and windows/UNIX end-of-line > characters getting inserted. Its driving us a little nutty and we > aren't quite sure how to figure out what is truly happening. Right now > we are removing the ^M manually (well Emacs manually anyways). I have seen another problem, when checkins are done from Emacs, and you have $Log: $ lines in your source file, then multi-line comments can end up with DOS line ends even when the file being checked in has Unix line ends. I haven't worked out if this is an Emacs problem or WinCVS one.