Community
Participate
Working Groups
Build F2 Happens on Windows on 'CR' as line delimiter with files that have mixed line delimiters i.e. also have (CR,LF) as line delimiter 1. Add J9 plug-in from CVS 2. Delete the package from the source folder 3. Create a patch for that project (note: to file or to clipboard) Look at the patch with a binary editor (which does not do smart line termination. Note: We looked at the patch in Notes editor which let us assume that '-' are missing - but they are there.
F3 candidate.
I tried to narrow down the problem: - Add org.eclipse.jdt.launching.j9 from CVS - Delete the class J9LaunchingPlugin.java - Create a patch for that project I've attached the resulting patch file. Observe: the patch has 11 lines to be deleted. However the original file has 39. If you open the patch file with Notepad you can see that there are 3 lines with line delimiters not recognized by CVS although the file was checked into CVS as Text -kkv. These lines contain more than one original lines concatenated. Question: is this a legal patch file? Should I be able to apply this successfully or should I flag an error?
Created attachment 1228 [details] Strange patch file
If you view the file within Bugzilla it looks quite normal. However since it is the result of a file deletion all lines should have '-' as the first character. Viewing it within Notepad reveals the problem better.
How did the file end up with CRs as line delimiters?
We have tons of files that are like this. The Java editor can handle this that's why we don't see it immediately. Probably happend due to editing a file on different OSs and/or using copy&paste.
Although the patch looks strange, it is a well-formed patch. From a CVS perspective, a CR is not a character of interest. Could you apply the patch properly?
The summary says it all ;-)
Moving to compare. The patch is a valid patch. The local file should only have CRs just as the remote file does. Therefore, the comparision should work. This is a strange case because it is actually a deletion so there is no local file.
Fixed for 20020607 Verified by Dirk Baeumer
Verified.