My favorites | Sign in
Project Home Downloads Wiki Issues Source
New issue   Search
for
  Advanced search   Search tips   Subscriptions
Issue 3526: Unable to apply patch
2 people starred this issue and may be notified of changes. Back to list
Status:  AwaitingInformation
Owner:  ----


Sign in to add a comment
 
Reported by arunjobe...@gmail.com, Aug 20, 2015
*****************************************************************
*****                                                       *****
***** !!!! THIS BUG TRACKER IS FOR GERRIT CODE REVIEW !!!!  *****
*****                                                       *****
***** DO NOT SUBMIT BUGS FOR CHROME, ANDROID, CYANOGENMOD,  *****
***** INTERNAL ISSUES WITH YOUR COMPANY'S GERRIT SETUP, ETC.*****
*****                                                       *****
*****   THOSE ISSUES BELONG IN DIFFERENT ISSUE TRACKERS     *****
*****                                                       *****
*****************************************************************

Affected Version: Gerrit 2.10


What steps will reproduce the problem?
1.Developer A - pushes microsoft excel/doc files for code-review
2.Developer B, downloads the patch in the form of .diff
3.Tries to apply the patch using tortoisegit

What is the expected output? What do you see instead?
Expected output: patch should be successful.

Instead:
Error: error: cannot apply binary patch to 'FolderA/subfolder1/document.doc/.xlsx' without full index line error: 'FolderA/subfolder1/document.doc/.xlsx': Patch does not apply

Please provide any additional information below.
If I do the same process for any .java files or .xml files or .txt files... there are no issues, patch is getting applied successfully.

I am getting this error only for word and excel documents. How to fix this?
Please help
My Gerrit version: Gerrit 2.10
   Git : 1.9.5.msysgit.1
Tortoisegit: TortoiseGit 1.8.14.0
Aug 20, 2015
Project Member #1 david.pu...@sonymobile.com
Is Developer B able to apply the patch if Developer A generates it with git's format patch command?
Status: AwaitingInformation
Aug 20, 2015
#4 arunjobe...@gmail.com
Yes.... when Developer A created the patch of the same MS Word and MS Excel files in the ".patch" format..... Developer B could apply it.  We tested this directly over system to system... not through Gerrit... Because in Gerrit, there is no ".patch" format available.

For testing, Developer A created the patch in ".patch" format using tortoisegit and Developer B also used tortoisegit to apply.. and it worked.

But, how to achieve this using Gerrit.. We really need Gerrit
Sign in to add a comment

Powered by Google Project Hosting