Re: WinCVS incorrectly showing locally modified files

[Russ Tremain]

At 10:25 AM -0800 3/8/01, address@hidden wrote:
>Content-Type: text/plain; charset=US-ASCII
>Content-Disposition: inline
>       ;Creation-Date="Thu, 8 Mar 2001 12:25:20 -0600"
>Content-Transfer-Encoding: 7bit
>
>WinCVS version 1.2 is incorrectly reporting that cvs controlled files 
>are locally modified. Interesting it only does this for some files and 
>not others. To check out files, I'm using the version of cvs.exe that 
>comes with cygwin (version 1.11). Any help is greatly appreciated. 


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.
2.  edit the file using a DOS editor that bullies the file into
    DOS EOL conventions.
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.

-Russ
 
P.S.  Wonder how many person years have been wasted on this
      little problem since 1981?