[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

RE: WinCVS incorrectly showing locally modified files

From: Chuck . Irvine
Subject: RE: WinCVS incorrectly showing locally modified files
Date: Thu, 8 Mar 2001 13:34:07 -0600

> One thing that will cause this is if you have users that
> commit files with DOS EOL characters.  I believe the sequence is this:
> 1.  in wincvs or upon cygwin installation, select the option to
>     preserve unix EOL conventions.

I have this set for both cygwin and WinCVS. My interpretation of this 
is that when a file gets checked out, it will get checked out without 
the ^M's. Is this correct?

> 2.  edit the file using a DOS editor that bullies the file into
>     DOS EOL conventions.

It is true that you could use a text editor that re-inserts the ^Ms, 
but when you commit the file to a server running on a remote unix host, 
won't the ^M's be removed, that is, unless the file was checked in this 
the binary option.

> 3.  commit the file.
> 4.  the file is now in the repository with ^M's
> 5.  user2 does an update, with the same wincvs setup.
> 6.  user2 sees a merge conflict, with the contents of the
>     entire file.

An interesting note is that I wasn't seeing this problem until after I 
upgraded to WinCVS 1.2. Unfortunately, I can't see for sure that this 
is the cause of the problem because at around the same time, I also 
deleted and freshly installed cygwin.

I'm not sure that I mentioned this. When I invoke "cvs update" from the 
command line, no files are listed as locally modified.

Another thing. If, from WinCVS, I update any of these files that are 
being incorrectly identified as modifed, the problem goes away, i.e. 
the file appears as up-to-date. If I look in the WinCVS log window, 
nothing got updated.

I'm still needing help. Thanks



reply via email to

[Prev in Thread] Current Thread [Next in Thread]