Eclipse false conflicts in CVS synchronization

[whit...@con2inc.com]

When we CVS synchronize with Eclipse, hundreds of false conflicts show
up in the synchronization window. When we look at each in the
comparison editor, it shows there are no conflicts. With hundreds of
files shown to have conflicts, that don't have conflicts, finding the
true conflicts becomes a major task, We have activated the "ignore
white space mode". We do Linux and Windows development.

This is a big problem. Does anyone understand it and know how to fix
it?

Thanks,
Gary Whitten
whitteng @ con2inc.com

[Robert]

whit...@con2inc.com a écrit :

Yes, if you update/merge all the files, only files with true conflicts
won't be merged. So that you can work on problematic files only.

[ttrifonov]

Hi,

I suppose the problem is in different "end of line" separator for
Linux and Windows. If this is the problem you can try to do that:

1. Go to Window, Preferences, Team, CVS.
2. Choose "Files and Folders" tab.
3. Unchecked "Convert text files to use platform line ending"

Regards,
Tanyu