Mailing-List:	contact cygwin-help AT sourceware DOT cygnus DOT com; run by ezmlm
List-Subscribe:	<mailto:cygwin-subscribe AT sources DOT redhat DOT com>
List-Archive:	<http://sources.redhat.com/ml/cygwin/>
List-Post:	<mailto:cygwin AT sources DOT redhat DOT com>
List-Help:	<mailto:cygwin-help AT sources DOT redhat DOT com>, <http://sources.redhat.com/ml/#faqs>
Sender:	cygwin-owner AT sources DOT redhat DOT com
Delivered-To:	mailing list cygwin AT sources DOT redhat DOT com
Message-ID:	<3A23F79A.6353F0BD@phtek.com>
Date:	Tue, 28 Nov 2000 13:21:14 -0500
From:	Christopher Cobb <ccobb AT phtek DOT com>
X-Mailer:	Mozilla 4.75 [en] (WinNT; U)
X-Accept-Language:	en
MIME-Version:	1.0
To:	cygwin AT sourceware DOT cygnus DOT com
Subject:	Re: cvs end-of-line translation
References:	<20001128145809 DOT 10228 DOT qmail AT web123 DOT yahoomail DOT com>

Thank you.  I'll check out your suggestions.

cc

Earnie Boyd wrote:

> --- Christopher Cobb <ccobb AT cseg DOT com> wrote:
> > I am getting whole-file conflicts where the only difference is the
> > presence of ^M's in one version and not in the other.
> >
> > Does this have to do with how the end-of-file setting is set in cygwin?
> >
> > We have unix/linux clients and windows clients (with cygwin).  Cygwin
> > and non-cygwin tools are used to edit files (i.e., tools which put ^M's
> > into the files).
> >
> > How can I avoid whole-file conflicts?
> >
>
> Three methods:
>
> 1) Filter the text files so that the ^M is removed.
>    a) Rename cvs.exe to cygcvs.exe
>    b) Create a script named cvs that filters the files in a manner appropriate
>       for you.  There are several ways to do it, none of which is more right
>       than the other.
>    c) execute cygcvs with the options passed to your script.
>
> 2) Remount you Cygwin mounts in text mode.
>    a) mount -f c:/cygwin /          # you didn't give the `cygcheck -r -s -v'
>                                     # output so I don't know what mounts *you*
>                                     # have now.
>    b) If you have true binary files being checked in and out of CVS then this
>       won't work for you.
>
> 3) Get the cvs sources from the Cygwin mirror and rebuild it with automode.o
>    a) configure --prefix=/usr --sysconfdir=/etc --libexecdir=/sbin
>    b) modifiy the Makefile so that the cvs.exe is created with the
>       /usr/lib/automode.o object
>    c) make
>    d) make install
>
> Automode.o is a read in text, write in binary.  The alternative to this is to
> change the code in CVS.  If you're updating binary files this might not work
> for you.
>
> The three options above may or may not work.  They are suggestions to try not
> definitive methods of cure.
>
> Cheers,
>
> =====
> Earnie Boyd
> mailto:earnie_boyd AT yahoo DOT com
>
> ---         <http://earniesystems.safeshopper.com>         ---
> --- Cygwin: POSIX on Windows <http://gw32.freeyellow.com/> ---
> ---   Minimalist GNU for Windows <http://www.mingw.org/>   ---
>
> __________________________________________________
> Do You Yahoo!?
> Yahoo! Shopping - Thousands of Stores. Millions of Products.
> http://shopping.yahoo.com/


--
Want to unsubscribe from this list?
Send a message to cygwin-unsubscribe AT sourceware DOT cygnus DOT com

- Raw text -