Am 18.03.2010 12:08, Domingo Alvarez Duarte wrote: > Albrecht Schlosser wrote: >> Domingo Alvarez Duarte wrote: >>> With the last svn updates several files now have CR at the end of line >>> in several places that didn't exist before. >> >> which files?
> Try compare Fl_Gl_Window.H for example with a version before printing > and you can see it. I compared the current version (7301) with svn -r 7262 (directly before the merge), and I can't find any diffs other than those intended. > Probably I'm not saying it correctly it seems to an extra space at endo > of some lines, I'm using winmerge and I saw several files marked as > changed when in reality they only have extra space/CR at the end of some > lines. I know that sometimes extra spaces at EOL slip through (you can see this in the commit logs, often trailing spaces in empty lines). But I can't find this in the file you mentioned. Maybe you changed something on your system? A possible explanation for different line endings (LF vs. CR/LF) would be that you changed your svn client. I know that the Cygwin svn client uses LF only for files with attribute "native", whereas other windows svn clients may use CR/LF for the same files on the same system. Maybe you encountered something like this? Did you install a new version of your svn client? OTOH, Ian may well be right that a few files got their svn properties changed, and that may have such effects (depending on the svn client, maybe). Finally, if you want to tell if something changed, you can use subversion for the diff, e.g. $ svn diff Fl_Gl_Window.H -r7262:head shows only one block of diffs. If there are white space diffs, you can effectively reduce the diffs by using: $ svn diff --diff-cmd diff -x -ubw Fl_Gl_Window.H -r7262:head to see only the non-whitespace diffs. If there are significant diffs between the two commands, then there are probably unintended whitespace diffs. Albrecht _______________________________________________ fltk-dev mailing list [email protected] http://lists.easysw.com/mailman/listinfo/fltk-dev
