[webkit-dev] Style bot complains of missing binary data in diff when deleting .png test results

[Tony Chang]

The change you suggest for VCSUtils.pm seems fine to me, but if you use
'webkit-patch upload', it'll generate a diff that svn-apply can
successfully apply.

On Wed, Nov 30, 2011 at 5:42 PM, Alan Stearns <stearns at adobe.com> wrote:

>  David,
>
>   This is a bug where I accidentally turned on a pixel result, then needed
> to remove the .pngs when I fixed the problem:
>
> https://bugs.webkit.org/show_bug.cgi?id=73343
>
>   The patch had two lines like this:
>
> Binary files
> a/LayoutTests/platform/efl/fast/regions/no-split-line-box-expected.png and
> /dev/null differ
>
>   Which resulted in this output from style-queue:
>
> Failed to run "[u'/mnt/git/webkit-style-queue/Tools/Scripts/svn-apply',
> u'--force']" exit_code: 9
>
> Error: the Git diff contains a binary file without the binary data in
> line: "Binary files
> a/LayoutTests/platform/efl/fast/regions/no-split-line-box-expected.png and
> /dev/null differ".  Be sure to use the --binary flag when invoking "git
> diff" with diffs containing binary files. at
> /mnt/git/webkit-style-queue/Tools/Scripts/VCSUtils.pm line 667, <ARGV> line
> 45.
>
> Thanks,
>
> Alan
>
>
>
> On 11/30/11 5:36 PM, "David Levin" <levin at chromium.org> wrote:
>
> Perhaps you could give a bug that has an example of what you are talking
> about.
>
> For me it is hard to guess at what the complaint by the style bot is.
>
> dave
>
> On Wed, Nov 30, 2011 at 5:20 PM, Alan Stearns <stearns at adobe.com> wrote:
>
>
> If I delete a .png test result and I make a git diff without using the
> --binary flag, the style EWS bot complains. I can see why it would complain
> if I were rebasing the file - you need the binary data to see what's
> changed. It makes less sense to me to add the binary data to the diff if
> the
> file is just being deleted.
>
> Should VCSUtils.pm detect a "... and /dev/null differ" line and let it
> through? Are there dependencies on the binary data in svn-apply or other
> tools?
>
> I'm planning on replacing some pixel-based verification with reftests in
> the
> near future, and so I'll be deleting quite a few .png files. I don't mind
> slinging around all that binary data, but if it's not really needed I'd
> rather leave it out.
>
> Thanks,
>
> Alan
>
> _______________________________________________
> webkit-dev mailing list
> webkit-dev at lists.webkit.org
> http://lists.webkit.org/mailman/listinfo.cgi/webkit-dev
>
>
>
>
> _______________________________________________
> webkit-dev mailing list
> webkit-dev at lists.webkit.org
> http://lists.webkit.org/mailman/listinfo.cgi/webkit-dev
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.webkit.org/pipermail/webkit-dev/attachments/20111201/32b26e6c/attachment.html>