Bug 5150 - Compare with patch cannot read VCM's CVS patch file
Summary: Compare with patch cannot read VCM's CVS patch file
Status: RESOLVED FIXED
Alias: None
Product: JDT
Classification: Eclipse Project
Component: UI (show other bugs)
Version: 2.0   Edit
Hardware: PC other
: P1 normal (vote)
Target Milestone: ---   Edit
Assignee: Andre Weinand CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks: 5025
  Show dependency tree
 
Reported: 2001-10-22 14:25 EDT by Jean-Michel Lemieux CLA
Modified: 2001-10-30 05:09 EST (History)
0 users

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
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.