From mboxrd@z Thu Jan 1 00:00:00 1970 Path: main.gmane.org!not-for-mail From: Phillip Lord Newsgroups: gmane.emacs.help Subject: Re: NTEmacs, CVS, PCL-CVS, Version Control and ^M? Date: 24 Apr 2003 10:33:26 +0100 Organization: Dept of Computer Science, University of Manchester, U.K. Sender: help-gnu-emacs-bounces+gnu-help-gnu-emacs=m.gmane.org@gnu.org Message-ID: References: NNTP-Posting-Host: main.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: main.gmane.org 1051178770 9054 80.91.224.249 (24 Apr 2003 10:06:10 GMT) X-Complaints-To: usenet@main.gmane.org NNTP-Posting-Date: Thu, 24 Apr 2003 10:06:10 +0000 (UTC) Original-X-From: help-gnu-emacs-bounces+gnu-help-gnu-emacs=m.gmane.org@gnu.org Thu Apr 24 12:06:05 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 198dcD-0002LT-00 for ; Thu, 24 Apr 2003 12:06:05 +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 198dbw-0007Pl-07 for gnu-help-gnu-emacs@m.gmane.org; Thu, 24 Apr 2003 06:05:48 -0400 Original-Path: shelby.stanford.edu!newsfeed.stanford.edu!news-spur1.maxwell.syr.edu!news.maxwell.syr.edu!newsfeed.icl.net!newsfeed.fjserv.net!nntp.theplanet.net!inewsm1.nntp.theplanet.net!newspeer.lavaseals.co.uk!zen.net.uk!130.88.203.18.MISMATCH!peernews.mcc.ac.uk!cs.man.ac.uk!not-for-mail Original-Newsgroups: gnu.emacs.help Original-Lines: 40 Original-NNTP-Posting-Host: rpc71.cs.man.ac.uk Original-X-Trace: wapping.cs.man.ac.uk 1051176806 2313 130.88.198.228 (24 Apr 2003 09:33:26 GMT) Original-X-Complaints-To: news@wapping.cs.man.ac.uk Original-NNTP-Posting-Date: Thu, 24 Apr 2003 09:33:26 +0000 (UTC) User-Agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.2.93 Original-Xref: shelby.stanford.edu gnu.emacs.help:112268 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:8766 X-Report-Spam: http://spam.gmane.org/gmane.emacs.help:8766 >>>>> "Galen" == Galen Boyer writes: Galen> We have a CVS server on a UNIX machine but, AFAIK, most of us Galen> are committing our work from Windows machines. But, we also Galen> have a mix of people using WINCVS and cygwin CVS Galen> command-line. I and the other cygwin users will also use Galen> WinCVS on and off as well, so this may be causing issues? I Galen> use PCL-CVS for most of my day-to-day CVS work. (The Galen> .cvspass will get munged every once in awhile because of Galen> these switch offs) What seems to be happening, but I can't Galen> quite find the pattern is that more than one ^M will get Galen> appended to the end of the files so then the ^M's show up, no Galen> matter what how I ask Emacs to handle the ^M, because there Galen> is more than one. If you try and use more than one client, then you are likely to get into trouble. So, for instance, using both a unix client, and a wincvs client on the same files will result in line terminator problems. You could put a check script into the CVS. Essentially any windows terminators in the repository are wrong (in a text file obviously). Galen> What I'd like to know is if anybody has any experience with Galen> odd behavior from checking in and checking out code and Galen> windows/UNIX end-of-line characters getting inserted. Its Galen> driving us a little nutty and we aren't quite sure how to Galen> figure out what is truly happening. Right now we are Galen> removing the ^M manually (well Emacs manually anyways). Most of the people here are using one client only, and although we have had some problems it generally works. All the Windows emacs users use dos terminators all the time, even with cygwin CVS. Good luck. Phil