RE: [jcvs] elaborately introduced end-of-file conflict (first post).

["Schilling, Richard" <RSchilling@affiliatedhealth.org>]

The end-of-file character is different in Windows platforms than UNIX.  And
if you create or edit a file on a Windows machine then transfer it to a UNIX
box as a binary file, it won't import into the CVS repository correctly from
the UNIX box. 

Or Let's say you're using Windows, and you connect to a UNIX box through
Samba by mounting a remote directory.  You can then access files on the UNIX
box from your Windows machine just like you would if you were using a
Windows NT share.  So, you edit the file using Windows tools, and then log
on to the UNIX box to import the file into the CVS repository.    The end of
file character is in Windows format, so the CVS repository treats it like a
normal character.  

In such a case you get conflicts in jCVS when you try to commit the file.

I know, that's clear as mud :-)

Richard Schilling
Webmaster / Web Integration Programmer
Affiliated Health Services
Mount Vernon, WA USA
http://www.affiliatedhealth.org
phone: 360.856.7129


> -----Original Message-----
> From: Tim Endres [mailto:time@trustice.com]
> Sent: Thursday, November 15, 2001 5:27 PM
> To: Schilling, Richard; jcvs@server.gjt.org
> Subject: Re: [jcvs] elaborately introduced end-of-file conflict (first
> post).
> 
> 
> Hi Richard,
> 
> I must admit that I do not quite understand what you are 
> talking about.
> What is an end-of-file conflict?
> 
> tim.
> 
> > This is my first post to the list, so greetings all.  I 
> researched the list
> > archives for hints on why the end-of-file conflict occurs 
> for some users.
> > 
> > Just looking for confirmation on whether or not the 
> following procedure
> > would also cause the end-of-file conflict:
> > 
> > 	1. tar and compress a directory tree using tar and gzip 
> on Windows
> > with cygwin.
> > 	2. ftp the resulting file to a UNIX box (where the CVS 
> repository
> > is).
> > 	3. gunzip and extract the directory tree, and import 
> into CVS (on
> > the UNIX box).
> > 	4. checkout the repository to a Windows workstation using jCVS.
> > 
> > Thanks.
> > 
> > Richard Schilling
>