When we do a CVS synchornization in Eclipse, the Java files work well,
but ALL (dozens) of text
files show up as having conflicts, apparently because white space is
NOT being ignored. When
we ignore white space on a file by file basis, the conflicts disappear.
But we have not been
able to ignore white space globally, so we have to go through our
dozens of text files one by one, which
is very tedious and time consuming.
How do we GLOBALLY avoid white space characters causing text files
looking like they have
conflicts when doing an Eclipse CVS synchronize.
Paul Hamaker - 17 Jun 2006 13:53 GMT
Maybe this helps:
Window
Preferences
General
Compare/Patch : check Ignore white space
--------------------
Paul Hamaker, SEMM, teaching ICT since 1987
http://javalessons.com
whitteng@con2inc.com - 19 Jun 2006 22:47 GMT
Paul - Thanks but that option is already selected with, apparently, no
effect. We still
have the same problem.
Thanks,
Gary Whitten
whitteng@con2inc.com
> Maybe this helps:
> Window
[quoted text clipped - 4 lines]
> Paul Hamaker, SEMM, teaching ICT since 1987
> http://javalessons.com
Robert Mabee - 21 Jun 2006 18:31 GMT
> When we do a CVS synchornization in Eclipse, the Java files work well,
> but ALL (dozens) of text
[quoted text clipped - 9 lines]
> looking like they have
> conflicts when doing an Eclipse CVS synchronize.
Perhaps you'll have to look inside CVS. It used to be all shell
scripts.
Alternatively, you could standardize on one white space form that
Eclipse is comfortable with, require all developers to use that and
refrain from adjusting indentation of existing code, and take the
one-time hit of checking in canonical forms of the existing sources.
I'd look at the CVS repository files. They used to be plain text
and line-oriented 'diff' output so a cheap trick would be to use a
white-space-canonicalizing program on them, although this might make
back versions indent wrong (if the diff lines start with line numbers
that affect tab position). Of course you'd make a backup before
tampering with vital files.