This is the mail archive of the cygwin@cygwin.com mailing list for the Cygwin project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: newline/linefeed problem with CVS


Something is rotten somewhere.  Your workaround is not good enough for
me.  When I apply it, I now get millions of lines of diffs because the
files I had already checked out differ in their line ending only.

If I do this, in a particular checkout:

rm foo.cl
cvs update foo.cl
touch foo.cl
cvs diff foo.cl

The last command shows the entire file being different (by line ending
only).  That is, "cvs diff --ignore-all-space foo.cl" prints no diffs.

"cat -v foo.cl" shows ^M's at the end of lines.

This problem has me fairly well hosed.

Cygwin Win95/NT Configuration Diagnostics
Current System Time: Tue Aug 13 11:02:29 2002

Windows 2000 Professional Ver 5.0 Build 2195 Service Pack 3

Path:	C:\cygwin\usr\local\bin
	C:\cygwin\bin
	C:\cygwin\bin
	c:\Perl\bin
	c:\ODI\OStore\bin
	.
	c:\bin
	C:\cygwin\bin
	C:\cygwin\usr\local\bin
	c:\WINNT\system32
	c:\WINNT
	c:\WINNT\System32\Wbem
	c:\Program Files\Microsoft Visual Studio\Common\Tools\WinNT
	c:\Program Files\Microsoft Visual Studio\Common\MSDev98\Bin
	c:\Program Files\Microsoft Visual Studio\Common\Tools
	c:\Program Files\Microsoft Visual Studio\VC98\bin
	d:\openssl-0.9.6\out32dll
	c:\Program Files\Resource Kit\

SysDir: C:\WINNT\System32
WinDir: C:\WINNT

HOME = `C:\cygwin\home\layer'
MAKE_MODE = `unix'
PWD = `/usr/bin'
USER = `layer'

Use `-r' to scan registry

a:  fd           N/A    N/A                    
c:  hd  NTFS    8997Mb  50% CP CS UN PA FC     hobart_c
d:  hd  NTFS   30255Mb  36% CP CS UN PA FC     hobart_d
l:  cd           N/A    N/A                    
m:  cd           N/A    N/A                    
z:  net NTFS    8350Mb  91% CP CS    PA        pc

C:\cygwin      /          system  textmode
c:             /c         system  textmode
d:             /d         system  textmode
C:\cygwin/bin  /usr/bin   system  textmode
C:\cygwin/lib  /usr/lib   system  textmode
z:             /z         system  textmode
.              /cygdrive  user    textmode,cygdrive

Found: .\bash.exe
Found: C:\cygwin\bin\bash.exe
Found: .\cat.exe
Found: C:\cygwin\bin\cat.exe
Found: .\cpp.exe
Found: C:\cygwin\bin\cpp.exe
Found: .\find.exe
Found: C:\cygwin\bin\find.exe
Found: .\gcc.exe
Found: C:\cygwin\bin\gcc.exe
Found: .\gdb.exe
Found: C:\cygwin\bin\gdb.exe
Found: .\ld.exe
Found: C:\cygwin\bin\ld.exe
Found: .\ls.exe
Found: C:\cygwin\bin\ls.exe
Found: .\make.exe
Found: C:\cygwin\bin\make.exe
Found: .\sh.exe
Found: C:\cygwin\bin\sh.exe

   58k 2002/05/07 .\cygbz2-1.dll
  625k 2002/08/09 .\cygcrypto.dll
   45k 2001/04/25 .\cygform5.dll
   35k 2002/01/09 .\cygform6.dll
   19k 2002/02/20 .\cyggdbm.dll
   17k 2001/06/28 .\cyghistory4.dll
   20k 2002/07/17 .\cyghistory5.dll
  929k 2002/06/24 .\cygiconv-2.dll
   22k 2001/12/13 .\cygintl-1.dll
   23k 2002/06/24 .\cygintl-2.dll
   81k 2001/10/20 .\cygitcl30.dll
   35k 2001/10/20 .\cygitk30.dll
  119k 2002/02/09 .\cygjpeg6b.dll
   26k 2001/04/25 .\cygmenu5.dll
   20k 2002/01/09 .\cygmenu6.dll
  156k 2001/04/25 .\cygncurses++5.dll
  175k 2002/01/09 .\cygncurses++6.dll
  226k 2001/04/25 .\cygncurses5.dll
  202k 2002/01/09 .\cygncurses6.dll
   15k 2001/04/25 .\cygpanel5.dll
   12k 2002/01/09 .\cygpanel6.dll
   40k 2001/11/21 .\cygpcre.dll
   39k 2001/11/21 .\cygpcreposix.dll
  170k 2002/01/21 .\cygpng2.dll
   22k 2002/06/09 .\cygpopt-0.dll
  108k 2001/06/28 .\cygreadline4.dll
  127k 2002/07/17 .\cygreadline5.dll
  159k 2002/08/09 .\cygssl.dll
  390k 2001/10/20 .\cygtcl80.dll
    5k 2001/10/20 .\cygtclpip80.dll
   10k 2001/10/20 .\cygtclreg80.dll
  253k 2002/02/10 .\cygtiff3.dll
  623k 2001/10/20 .\cygtk80.dll
   41k 2002/01/20 .\cygXpm-noX4.dll
   46k 2002/01/20 .\cygXpm-X4.dll
   50k 2002/03/12 .\cygz.dll
  883k 2002/07/06 .\cygwin1.dll
    Cygwin DLL version info:
        DLL version: 1.3.12
        DLL epoch: 19
        DLL bad signal mask: 19005
        DLL old termios: 5
        DLL malloc env: 28
        API major: 0
        API minor: 54
        Shared data: 3
        DLL identifier: cygwin1
        Mount registry: 2
        Cygnus registry name: Cygnus Solutions
        Cygwin registry name: Cygwin
        Program options name: Program Options
        Cygwin mount registry name: mounts v2
        Cygdrive flags: cygdrive flags
        Cygdrive prefix: cygdrive prefix
        Cygdrive default prefix: 
        Build date: Sat Jul 6 02:16:58 EDT 2002
        CVS tag: cygwin-1-3-12-1
        Shared id: cygwin1S3

   58k 2002/05/07 .\cygbz2-1.dll
  625k 2002/08/09 .\cygcrypto.dll
   45k 2001/04/25 .\cygform5.dll
   35k 2002/01/09 .\cygform6.dll
   19k 2002/02/20 .\cyggdbm.dll
   17k 2001/06/28 .\cyghistory4.dll
   20k 2002/07/17 .\cyghistory5.dll
  929k 2002/06/24 .\cygiconv-2.dll
   22k 2001/12/13 .\cygintl-1.dll
   23k 2002/06/24 .\cygintl-2.dll
   81k 2001/10/20 .\cygitcl30.dll
   35k 2001/10/20 .\cygitk30.dll
  119k 2002/02/09 .\cygjpeg6b.dll
   26k 2001/04/25 .\cygmenu5.dll
   20k 2002/01/09 .\cygmenu6.dll
  156k 2001/04/25 .\cygncurses++5.dll
  175k 2002/01/09 .\cygncurses++6.dll
  226k 2001/04/25 .\cygncurses5.dll
  202k 2002/01/09 .\cygncurses6.dll
   15k 2001/04/25 .\cygpanel5.dll
   12k 2002/01/09 .\cygpanel6.dll
   40k 2001/11/21 .\cygpcre.dll
   39k 2001/11/21 .\cygpcreposix.dll
  170k 2002/01/21 .\cygpng2.dll
   22k 2002/06/09 .\cygpopt-0.dll
  108k 2001/06/28 .\cygreadline4.dll
  127k 2002/07/17 .\cygreadline5.dll
  159k 2002/08/09 .\cygssl.dll
  390k 2001/10/20 .\cygtcl80.dll
    5k 2001/10/20 .\cygtclpip80.dll
   10k 2001/10/20 .\cygtclreg80.dll
  253k 2002/02/10 .\cygtiff3.dll
  623k 2001/10/20 .\cygtk80.dll
   41k 2002/01/20 .\cygXpm-noX4.dll
   46k 2002/01/20 .\cygXpm-X4.dll
   50k 2002/03/12 .\cygz.dll
  883k 2002/07/06 .\cygwin1.dll
    Cygwin DLL version info:
        DLL version: 1.3.12
        DLL epoch: 19
        DLL bad signal mask: 19005
        DLL old termios: 5
        DLL malloc env: 28
        API major: 0
        API minor: 54
        Shared data: 3
        DLL identifier: cygwin1
        Mount registry: 2
        Cygnus registry name: Cygnus Solutions
        Cygwin registry name: Cygwin
        Program options name: Program Options
        Cygwin mount registry name: mounts v2
        Cygdrive flags: cygdrive flags
        Cygdrive prefix: cygdrive prefix
        Cygdrive default prefix: 
        Build date: Sat Jul 6 02:16:58 EDT 2002
        CVS tag: cygwin-1-3-12-1
        Shared id: cygwin1S3

   58k 2002/05/07 C:\cygwin\bin\cygbz2-1.dll
  625k 2002/08/09 C:\cygwin\bin\cygcrypto.dll
   45k 2001/04/25 C:\cygwin\bin\cygform5.dll
   35k 2002/01/09 C:\cygwin\bin\cygform6.dll
   19k 2002/02/20 C:\cygwin\bin\cyggdbm.dll
   17k 2001/06/28 C:\cygwin\bin\cyghistory4.dll
   20k 2002/07/17 C:\cygwin\bin\cyghistory5.dll
  929k 2002/06/24 C:\cygwin\bin\cygiconv-2.dll
   22k 2001/12/13 C:\cygwin\bin\cygintl-1.dll
   23k 2002/06/24 C:\cygwin\bin\cygintl-2.dll
   81k 2001/10/20 C:\cygwin\bin\cygitcl30.dll
   35k 2001/10/20 C:\cygwin\bin\cygitk30.dll
  119k 2002/02/09 C:\cygwin\bin\cygjpeg6b.dll
   26k 2001/04/25 C:\cygwin\bin\cygmenu5.dll
   20k 2002/01/09 C:\cygwin\bin\cygmenu6.dll
  156k 2001/04/25 C:\cygwin\bin\cygncurses++5.dll
  175k 2002/01/09 C:\cygwin\bin\cygncurses++6.dll
  226k 2001/04/25 C:\cygwin\bin\cygncurses5.dll
  202k 2002/01/09 C:\cygwin\bin\cygncurses6.dll
   15k 2001/04/25 C:\cygwin\bin\cygpanel5.dll
   12k 2002/01/09 C:\cygwin\bin\cygpanel6.dll
   40k 2001/11/21 C:\cygwin\bin\cygpcre.dll
   39k 2001/11/21 C:\cygwin\bin\cygpcreposix.dll
  170k 2002/01/21 C:\cygwin\bin\cygpng2.dll
   22k 2002/06/09 C:\cygwin\bin\cygpopt-0.dll
  108k 2001/06/28 C:\cygwin\bin\cygreadline4.dll
  127k 2002/07/17 C:\cygwin\bin\cygreadline5.dll
  159k 2002/08/09 C:\cygwin\bin\cygssl.dll
  390k 2001/10/20 C:\cygwin\bin\cygtcl80.dll
    5k 2001/10/20 C:\cygwin\bin\cygtclpip80.dll
   10k 2001/10/20 C:\cygwin\bin\cygtclreg80.dll
  253k 2002/02/10 C:\cygwin\bin\cygtiff3.dll
  623k 2001/10/20 C:\cygwin\bin\cygtk80.dll
   41k 2002/01/20 C:\cygwin\bin\cygXpm-noX4.dll
   46k 2002/01/20 C:\cygwin\bin\cygXpm-X4.dll
   50k 2002/03/12 C:\cygwin\bin\cygz.dll
  883k 2002/07/06 C:\cygwin\bin\cygwin1.dll
    Cygwin DLL version info:
        DLL version: 1.3.12
        DLL epoch: 19
        DLL bad signal mask: 19005
        DLL old termios: 5
        DLL malloc env: 28
        API major: 0
        API minor: 54
        Shared data: 3
        DLL identifier: cygwin1
        Mount registry: 2
        Cygnus registry name: Cygnus Solutions
        Cygwin registry name: Cygwin
        Program options name: Program Options
        Cygwin mount registry name: mounts v2
        Cygdrive flags: cygdrive flags
        Cygdrive prefix: cygdrive prefix
        Cygdrive default prefix: 
        Build date: Sat Jul 6 02:16:58 EDT 2002
        CVS tag: cygwin-1-3-12-1
        Shared id: cygwin1S3


Cygwin Package Information
Package             Version             
_update-info-dir    00047-1             
ash                 20020731-1          
autoconf            2.53b-1             
autoconf-devel      2.53a-1             
autoconf-stable     2.13-4              
bash                2.05b-3             
binutils            20020706-2          
bison               1.35-1              
byacc               1.9-1               
bzip2               1.0.2-2             
clear               1.0-1               
crypt               1.0-1               
ctags               5.2-1               
cvs                 1.11.0-1            
cygrunsrv           0.95-1              
cygutils            1.1.2-1             
cygwin              1.3.12-4            
diff                1.0-1               
diffutils           2.8.1-1             
file                3.37-1              
fileutils           4.1-1               
findutils           4.1.7-4             
gawk                3.0.4-1             
gcc                 2.95.3-5            
gcc2                2.95.3-9            
gdb                 20010428-3          
gdbm                1.8.0-4             
grep                2.5-1               
groff               1.17.2-1            
gzip                1.3.3-4             
inetutils           1.3.2-19            
jpeg                6b-7                
less                374-1               
libbz2_1            1.0.2-2             
libiconv2           1.8-2               
libintl1            0.10.40-1           
libintl2            0.11.2-2            
libncurses5         5.2-1               
libncurses6         5.2-8               
libpng2             1.0.12-1            
libpopt0            1.6.4-4             
libreadline4        4.1-2               
libreadline5        4.3-1               
login               1.4-4               
m4                  0.0                 
make                3.79.1-7            
man                 1.5g-2              
mingw-runtime       2.0-2               
mktemp              1.4-1               
ncftp               3.1.4-1             
ncurses             5.2-8               
openssh             3.4p1-5             
openssl             0.9.6g-1            
openssl-devel       0.9.6g-1            
patch               2.5-3               
pcre                3.7-1               
perl                5.6.1-2             
readline            4.3-1               
rsync               2.5.5-1             
sed                 3.02-1              
sh-utils            2.0-2               
tar                 1.13.19-1           
termcap             20020403-1          
terminfo            5.2-3               
texinfo             4.2-3               
textutils           2.0.21-1            
tiff                3.5.7-1             
time                1.7-1               
vim                 6.1-2               
w32api              1.5-1               
wget                1.8.2-1             
which               1.5-1               
whois               4.5.17-1            
xpm-nox             4.2.0-1             
zip                 2.3-2               
zlib                1.1.4-1             

Use -h to see help about each section
 

--
Unsubscribe info:      http://cygwin.com/ml/#unsubscribe-simple
Bug reporting:         http://cygwin.com/bugs.html
Documentation:         http://cygwin.com/docs.html
FAQ:                   http://cygwin.com/faq/


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]