Hello Ara, what are the line endings for your local files? If you have Windows and Linux on your machine, you never may checkout files on Windows, switch to Linux and commit there (or visa versa).
Tom At 10:33 18.02.02 +0300, you wrote: >Hi Ara, > >Looks like this is the cvs client who adds EOFs. When working with CVS, IDEA >delegates all file operations to the cvs command line client. >And the behaviour you described was noticed when your cvs server works on >Linux and you use IDEA on Windows. > >Best regards, >Eugene Zhuravlev >IntelliJ Software, http://www.intellij.com/ >"Develop with pleasure!" > >----- Original Message ----- >From: "Ara Abrahamian" <[EMAIL PROTECTED]> >To: <[EMAIL PROTECTED]> >Sent: Monday, February 18, 2002 0:07 >Subject: [Eap-list] cvs conflict problem > > > > Today seems to be the day of bugs for me :o) > > > > Anyway, I'm using WinCVS and IDEA. Suppose I'm modifying class A, now I > > checkout latest version from cvs and AFAICS if there's a conflict the > > area after the ======= sign adds empty line for each line so: > > > > /* > > * Change log > > * > > */ > > > > Becomes: > > > > /* > > > > * Change log > > > > * > > > > */ > > > > !!! And the empty lines seem to be ^M character or something like that. > > > > Is it an IDEA bug? Anyone else encountering it? > > > > Cheers, > > Ara. > > > > > > _________________________________________________________ > > Do You Yahoo!? > > Get your free @yahoo.com address at http://mail.yahoo.com > > > > > > _______________________________________________ > > Eap-list mailing list > > [EMAIL PROTECTED] > > http://www.intellij.com/mailman/listinfo/eap-list > > >_______________________________________________ >Eap-list mailing list >[EMAIL PROTECTED] >http://www.intellij.com/mailman/listinfo/eap-list _______________________________________________ Eap-list mailing list [EMAIL PROTECTED] http://www.intellij.com/mailman/listinfo/eap-list
