I filed a JIRA to track applying binary patches, posted some notes from a quick investigation:
https://issues.apache.org/jira/browse/HADOOP-10926 On Tue, Jul 29, 2014 at 10:37 AM, Andrew Wang <andrew.w...@cloudera.com> wrote: > We could change test-patch to use "git apply" instead of the patch > command. I know a lot of us use git apply when committing, so it seems like > a safe change. > > > On Tue, Jul 29, 2014 at 1:44 AM, Niels Basjes <ni...@basjes.nl> wrote: > >> I think this behavior is better. >> This way you know you patch was not (fully) applied. >> >> It would be even better if there was a way to submit a patch with a binary >> file in there. >> >> Niels >> >> >> On Mon, Jul 28, 2014 at 11:29 PM, Andrew Wang <andrew.w...@cloudera.com> >> wrote: >> >> > I had the same issue on HDFS-6696, patch generated with "git diff >> > --binary". I ended up making the same patch without the binary part and >> it >> > could be applied okay. >> > >> > This does differ in behavior from the old boxes, which were still able >> to >> > apply the non-binary parts of a binary-diff. >> > >> > >> > On Mon, Jul 28, 2014 at 3:06 AM, Niels Basjes <ni...@basjes.nl> wrote: >> > >> > > For my test case I needed a something.txt.gz file >> > > However for this specific test this file will never be actually read, >> it >> > > just has to be there and it must be a few bytes in size. >> > > Because binary files do't work I simply created a file containging >> "Hello >> > > world" >> > > Now this isn't a gzip file at all, yet for my test it does enough to >> make >> > > the test work as intended. >> > > >> > > So in fact I didn't solve the binary attachment problem at all. >> > > >> > > >> > > On Mon, Jul 28, 2014 at 1:40 AM, Ted Yu <yuzhih...@gmail.com> wrote: >> > > >> > > > Mind telling us how you included the binary file in your svn patch ? >> > > > >> > > > Thanks >> > > > >> > > > >> > > > On Sun, Jul 27, 2014 at 12:27 PM, Niels Basjes <ni...@basjes.nl> >> > wrote: >> > > > >> > > > > I created a patch file with SVN and it works now. >> > > > > I dare to ask: Are there any git created patch files that work? >> > > > > >> > > > > >> > > > > On Sun, Jul 27, 2014 at 9:44 PM, Niels Basjes <ni...@basjes.nl> >> > wrote: >> > > > > >> > > > > > I'll look for a workaround regarding the binary file. Thanks. >> > > > > > >> > > > > > >> > > > > > On Sun, Jul 27, 2014 at 9:07 PM, Ted Yu <yuzhih...@gmail.com> >> > wrote: >> > > > > > >> > > > > >> Similar problem has been observed for HBase patches. >> > > > > >> >> > > > > >> Have you tried attaching level 1 patch ? >> > > > > >> For the binary file, to my knowledge, 'git apply' is able to >> > handle >> > > it >> > > > > but >> > > > > >> hadoop is currently using svn. >> > > > > >> >> > > > > >> Cheers >> > > > > >> >> > > > > >> >> > > > > >> On Sun, Jul 27, 2014 at 11:01 AM, Niels Basjes < >> ni...@basjes.nl> >> > > > wrote: >> > > > > >> >> > > > > >> > Hi, >> > > > > >> > >> > > > > >> > I just submitted a patch and Jenkins said it failed to apply >> the >> > > > > patch. >> > > > > >> > But when I look at the console output >> > > > > >> > >> > > > > >> > >> > > > >> https://builds.apache.org/job/PreCommit-MAPREDUCE-Build/4771//console >> > > > > >> > >> > > > > >> > it says: >> > > > > >> > >> > > > > >> > At revision 1613826. >> > > > > >> > MAPREDUCE-2094 patch is being downloaded at Sun Jul 27 >> 18:50:44 >> > > UTC >> > > > > >> > 2014 fromhttp:// >> > > > > >> > >> > > > > >> >> > > > > >> > > > >> > > >> > >> issues.apache.org/jira/secure/attachment/12658034/MAPREDUCE-2094-20140727.patch*cp >> > > > > >> > : >> > > > > >> > cannot stat '/home/jenkins/buildSupport/lib/*': No such file >> or >> > > > > >> > directory >> > > > > >> > *The patch does not appear to apply with p0 to p2 >> > > > > >> > PATCH APPLICATION FAILED >> > > > > >> > >> > > > > >> > >> > > > > >> > Now I do have a binary file (for the unit test) in this >> patch, >> > > > > perhaps I >> > > > > >> > did something wrong? Or is this problem caused by the error I >> > > > > >> highlighted? >> > > > > >> > >> > > > > >> > What can I do to fix this? >> > > > > >> > >> > > > > >> > -- >> > > > > >> > Best regards / Met vriendelijke groeten, >> > > > > >> > >> > > > > >> > Niels Basjes >> > > > > >> > >> > > > > >> >> > > > > > >> > > > > > >> > > > > > >> > > > > > -- >> > > > > > Best regards / Met vriendelijke groeten, >> > > > > > >> > > > > > Niels Basjes >> > > > > > >> > > > > >> > > > > >> > > > > >> > > > > -- >> > > > > Best regards / Met vriendelijke groeten, >> > > > > >> > > > > Niels Basjes >> > > > > >> > > > >> > > >> > > >> > > >> > > -- >> > > Best regards / Met vriendelijke groeten, >> > > >> > > Niels Basjes >> > > >> > >> >> >> >> -- >> Best regards / Met vriendelijke groeten, >> >> Niels Basjes >> > >
