Hi there I had the same problem a while back I fixed it pretty easily in all effected files but it was a nuiscance
To fix your files i.e. get rid of the double line spacing :- go to Search -> Replace text to find : \r\r replace with :( leave blank ) and click on regular expression. This seems to work fine. All you have to do then is check your file back into CVS. If your feelin brave you can do this on all files using find in path, but i suspect that not all your files will be effected. Hope this helps? It would be really nice if IntelliJ could provide an easy way to deal with this? > -----Original Message----- > From: Thomas Singer [mailto:[EMAIL PROTECTED]] > Sent: 18 February 2002 08:58 > To: [EMAIL PROTECTED] > Subject: Re: [Eap-list] cvs conflict problem > > > 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 > For optimum solutions that save you time, visit www.ds-s.com. _______________________________________________ Eap-list mailing list [EMAIL PROTECTED] http://www.intellij.com/mailman/listinfo/eap-list
