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

Bug 419611

Summary: cannot apply a patch created by Orion, shows HunkHeader error
Product: [ECD] Orion Reporter: Grant Gayed <grant_gayed>
Component: GitAssignee: Project Inbox <orion.git-inbox>
Status: RESOLVED WORKSFORME QA Contact:
Severity: major    
Priority: P3 CC: simon_kaegi
Version: 4.0   
Target Milestone: ---   
Hardware: PC   
OS: Windows 7   
Whiteboard:
Attachments:
Description Flags
test patch file none

Description Grant Gayed CLA 2013-10-16 11:46:15 EDT 

    


    


      



        
          Comment 1
        

        
          Grant Gayed CLA

        

        
        

        
          2013-10-16 12:45:36 EDT
        

      






I20131016-1157

- check out branch origin/bug419611 of org.eclipse.orion.client from the main repo
- attempt to apply the attached patch, which should apply cleanly because it is based on this branch's exact content + changes to one file (shellPage.js) that are reverted in the branch
   -> the attempt fails with error message: "Apply patch failed. Cannot apply: HunkHeader[26,7->26,6]"

    


    


      



        
          Comment 2
        

        
          Grant Gayed CLA

        

        
        

        
          2013-10-16 12:50:10 EDT
        

      






Created attachment 236560 [details]
test patch file

The patch content was created on Orion's Git Status page by selecting the modified unstaged file and clicking the Show Patch link.  The content was then copied and pasted into Notepad and saved to the .txt file.

    


    


      



        
          Comment 3
        

        
          Simon Kaegi CLA

        

        
        

        
          2013-10-17 16:10:00 EDT
        

      






was this at all related to the history re-writing that happened the day this bug was logged?

    


    


      



        
          Comment 4
        

        
          Grant Gayed CLA

        

        
        

        
          2013-10-17 16:15:09 EDT
        

      






(In reply to Simon Kaegi from comment #3)

I don't think so, I initially saw this late last week, but didn't put a case together until this report.

    


    


      



        
          Comment 5
        

        
          Grant Gayed CLA

        

        
        

        
          2015-05-01 14:10:09 EDT
        

      






Don't have a reproducible case of this anymore, so closing report.