Community
Participate
Working Groups
Windows 2000 Eclipse F1 In the attached patch, I need to check off "Ignore Whitespace option before patch can be applied. This does not seem correct given the patch. The patch is against org.eclipse.swt/Eclipse SWT Custom Widgets/common/org/eclipse/swt/custom
Created attachment 953 [details] patch for TableTree
Veronika, by 'check off "Ignore Whitespace" option' do you mean that the option had to be 'off' in order to allow a match? If yes, then thats a bug. If no, then the problem is that the file in the repository had been checked in as binary and that cvs creates incorrect patch file when comparing a binary file with a text file. In fact this seems to be the case here: your attachment shows an empty line after every non empty source line. In order for patch to handle this case you have to turn on "Ignore whitespace".
By "checked off" I meant that Ignore Whitespace was enabled. Is there a bug report against the fact that patch does not generate the correct result for comparing text and binary files?
Yes, I filed bug #11563. However VCM won't fix it so we will have to live with this problem as long as we have text files in binary mode in the repository. May be we can convert the files in the repository?
And what about a patch generated on Linux that can be applied on Windows? Do we have the same line delimiter problem? Can we not do something smarter about knowing the line delimiter for platforms and binary files?
Andre, there are two issues here. The first is that compare should handle both CR and CR/LF as line temrinators on all platforms (and convert all line terminators to the platform line terminator). The second is that CVS should NOT generate patches containing CR/CR/LF. If you already handle the first case then reassign this bug to VCM. Otherwise, we'll reopen bug 11563.
Changed patch so that 'Ignore whitespace' option is no longer required to enable the workaround for #11563. Patch already handles CR, LF, and CR/LF, so it works across platforms. Since #11563 has been reopened I close this one.
pls verify
Need to clear resolution due to bugzilla bug (it changed the resolution to NEW)
Marking bug as fixed again (due to bugzilla bug)