You could have kept your commits separate and generated a patch for each. The parameter for format-patch is the number of commits for which to generate patches.
-Konrad Sent from my BlackBerry smartphone. From: Raymond Toy Sent: Thursday, January 17, 2013 6:00 PM To: Konrad Piascik Cc: [email protected]; [email protected] Subject: Re: [webkit-dev] Can't upload patch On Thu, Jan 17, 2013 at 1:17 PM, Konrad Piascik <[email protected]<mailto:[email protected]>> wrote: Instead of piping the output of "git show", I'd use "git format-patch -1" This will generate a patch file for the topmost commit of your current branch. Thanks! That does the trick. I wasn't sure if the patches for the multiple commits would work if I concatenated them into one, so I just squashed my commits. It turns out that the patch was 2.16 MB, just over the limit. Ray Cheers, Konrad ________________________________________ From: [email protected]<mailto:[email protected]> [[email protected]<mailto:[email protected]>] on behalf of [email protected]<mailto:[email protected]> [[email protected]<mailto:[email protected]>] Sent: Thursday, January 17, 2013 3:43 PM To: Raymond Toy Cc: [email protected]<mailto:[email protected]> Subject: Re: [webkit-dev] Can't upload patch ... valid *diff* file. Damn you autocorrect! From: [email protected]<mailto:[email protected]> Sent: Thursday, January 17, 2013 3:42 PM To: Raymond Toy Cc: webkit-d [email protected]<mailto:[email protected]> Subject: Re: [webkit-dev] Can't upload patch Note that "git show" produces a valid different file, extra commit message notwithstanding. (The commit message is part of the header and will be ignored when used with diff and related tools.) If you have your commit, plus the ChangeLog changes mer ged into the same commit, you can just pipe the output of "git show" to a file and attach that to your bug manually instead. For the bots and the review machinery, the patch should be the same as if you had uploaded it through webkit-patch. You'll only miss out on a few sanity checks that webkit-patch performs before uploading, and the raw file will look slightly differently. Cheers, Jakob From: Raymond Toy Sent: Thursday, January 17, 2013 1:49 PM To: Adam Barth Cc: [email protected]<mailto:[email protected]> Subject: Re: [webkit-dev] Can't upload patch Hmm. I have a git checkout of webkit so svn-create-patch doesn't want to work. Yeah, the patch is probably too big. The particular patch could be broken up into 3-4 separate smaller patches. Perhaps that will work. On Thu, Jan 17, 2013 at 9:52 AM, Adam Barth <[email protected]<mailto:[email protected]><mailto:[email protected]<mailto:[email protected]>>> wrote: Have you tried uploading the patch manually by running svn-create-patch and using the "attachments" UI in bugs.webkit.org<http://bugs.webkit.org><http://bugs.webkit.org>? One possibility is that your patch is too big for bugs.webkit.org<http://bugs.webkit.org><http://bugs.webkit.org> to handle. You mention that it contains a number of binary files, which might be the cause of the problem. Adam On Thu, Jan 17, 2013 at 9:43 AM, Raymond Toy <[email protected]<mailto:[email protected]><mailto:[email protected]<mailto:[email protected]>>> wrote: > I'm trying to upload a patch and webkit-patch upload appears to do > everything except actually add the patch to the bug. > > I first ran webkit-patch upload and it correctly created the bug > (https://bugs.webkit.org/show_bug.cgi?id=106955) for me, but didn't upload > the patch. When I run webkit-patch upload again, it correctly shows the > diff, which consists of a a change to TestExpectations and several binary > files. It says it adding the patch, but when I look at the bug, there's no > patch. > > I'm missing something, but I don't know what it is. I've uploaded patches > before, so I know it used to work. :-( > > Any suggestions? > > Ray > > > _______________________________________________ > webkit-dev mailing list > [email protected]<mailto:[email protected]><mailto:[email protected]<mailto:[email protected]>> > http://lists.webkit.org/mailman/listinfo/webkit-dev > --------------------------------------------------------------------- This transmission (including any attachments) may contain confidential information, privileged material (including material protected by the solicitor-client or other applicable privileges), or constitute non-public information. Any use of this information by anyone other than the intended recipient is prohibited. If you have received this transmission in error, please immediately reply to the sender and delete this information from your system. Use, dissemination, distribution, or reproduction of this transmission by unintended recipients is not authorized and may be unlawful. --------------------------------------------------------------------- This transmission (including any attachments) may contain confidential information, privileged material (including material protected by the solicitor-client or other applicable privileges), or constitute non-public information. Any use of this information by anyone other than the intended recipient is prohibited. If you have received this transmission in error, please immediately reply to the sender and delete this information from your system. Use, dissemination, distribution, or reproduction of this transmission by unintended recipients is not authorized and may be unlawful. _______________________________________________ webkit-dev mailing list [email protected] http://lists.webkit.org/mailman/listinfo/webkit-dev
