Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 237228

Summary: Unified format patch from git will not apply
Product: [Eclipse Project] Platform Reporter: Robin Rosenberg <robin.rosenberg>
Component: TeamAssignee: Platform Team Inbox <platform-team-inbox>
Status: RESOLVED FIXED QA Contact:
Severity: normal    
Priority: P4 CC: tomasz.zarna
Version: 3.4Keywords: helpwanted
Target Milestone: ---   
Hardware: Other   
OS: Linux   
Whiteboard:
Attachments:
Description Flags
The patch
none
The file to apply patch onto none

Description Robin Rosenberg CLA 2008-06-15 19:35:22 EDT 
Build ID: Build id: I20080409-1425

Steps To Reproduce:

Try to apply the attached patch to the attached file. Team>Apply patch will
not accept it.

More information:

Note the --git option in the file diff header and the -- after the patch. 
Removing the --git part will make the first hunk applicable Removing the text after the patch will make the last hunk applicable. Removing both will make the whole patch applicable. 

GNU patch accepts this patch as it is a valid unified diff patch.
Comment 1 Robin Rosenberg CLA 2008-06-15 19:36:31 EDT 
Created attachment 104992 [details]
The patch
Comment 2 Tomasz Zarna CLA 2008-07-24 06:58:21 EDT 
Robin, what about the file I should apply the patch to? Could you attach it too? From what you're saying, it seems that skipping part of a git patch would make it applicable, right? Have you considered creating a fix?
Comment 3 Robin Rosenberg CLA 2008-07-24 15:45:02 EDT 
Created attachment 108389 [details]
The file to apply patch onto
Comment 4 Tomasz Zarna CLA 2008-07-31 07:54:17 EDT 
(In reply to comment #0)
> Note the --git option in the file diff header and the -- after the patch.

Sorry, I've just took a look at the first attachment and it looks like a mail message. I know that the message contains the patch. However, I'm not 100% which lines belong to patch and which don't. Could you please submit the patch only?
Comment 5 Robin Rosenberg CLA 2008-08-12 17:03:02 EDT 
I'm closing this. It seems to work in the release version (Build id: I20080617-2000).