Bug 5150

Summary: Compare with patch cannot read VCM's CVS patch file
Product: [Eclipse Project] JDT Reporter: Jean-Michel Lemieux <jean-michel_lemieux>
Component: UIAssignee: Andre Weinand <andre_weinand>
Status: RESOLVED FIXED QA Contact:
Severity: normal    
Priority: P1    
Version: 2.0   
Target Milestone: ---   
Hardware: PC   
OS: other   
Whiteboard:
Bug Depends on:    
Bug Blocks: 5025    

Description Jean-Michel Lemieux CLA 2001-10-22 14:25:09 EDT
I have added an action in the Team menu to create a patch file using CVS diff. 
The patch format is 'unified' with local addition showing (e.g. options -u -N 
to diff). When trying to apply this patch I get an invalid date error and a 
runtime exception. Please let me know if the patch file format is wrong. Or 
what diff options you expected to be used to create the CVS diff output.

Here is an example patch file that I have generated:

Index: bin/a.txt
===================================================================
RCS file: /home/jlemieux/workrepo/patch_example/bin/a.txt,v
retrieving revision 1.1
diff -u -r1.1 a.txt
--- bin/a.txt	19 Oct 2001 18:24:16 -0000	1.1
+++ bin/a.txt	22 Oct 2001 18:20:28 -0000
@@ -1 +1,2 @@
-sadfasdf
\ No newline at end of file
+sadfasdf
+ADDED L LINE
Index: src/newfile.txt
===================================================================
RCS file: src/newfile.txt
diff -N src/newfile.txt
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ src/newfile.txt	22 Oct 2001 18:20:28 -0000
@@ -0,0 +1 @@
+NEW
Comment 1 Erich Gamma CLA 2001-10-29 08:51:46 EST
Changed priority. This is important for the open source infrastructure.
Comment 2 Andre Weinand CLA 2001-10-30 05:09:25 EST
Had problems with the "\ No newline at end of file" line.
Fixed for 0.207.