[webkit-dev] svn-apply: ideal fuzz value to merge changelogs

David Kilzer ddkilzer at webkit.org
Thu May 27 08:40:50 PDT 2010

Providing 8 lines of context instead of 3 lines to the ChangeLog part of a patch isn't going to help with reviewing or merging patches.  If you want to provide more context to the rest of the patch, I think you should find a way to keep the number of lines of context for ChangeLog diffs to 3 lines.  (Perhaps git has some way to provide per-file settings for the diff command, much like it does for the merge driver in .gitattributes?)

It's unfortunate that git doesn't include "-U8" in the "diff --git a/foo b/foo" line in the patches it generates.  If it did, then the tools could be updated to parse the number of lines of context and use that in the patch command.


From: tonikitoo (Antonio Gomes) <tonikitoo at gmail.com>
To: webkit-dev Development <webkit-dev at lists.webkit.org>
Sent: Mon, May 24, 2010 11:55:03 AM
Subject: [webkit-dev] svn-apply: ideal fuzz value to merge changelogs


Lately I've noticed that most of my patches uploaded to bugzilla could
not get processed by any of the EWS bots at all (see purple balloons
in https://bugs.webkit.org/show_bug.cgi?id=36463 , for example). Chris
Jerdonek guess that I was generating my patches with special
parameters that were making svn-apply to fail to apply them, and it
seems he was right: as an attempt to give reviewers more context to
review my patches I will generating them with 8 lines of context.

$ git format-patch -1 HASH_OF_THE_PATCH -U8

According to him, "... the ChangeLog diffs are applied with "fuzz=3"
to allow the patch to apply (and be inserted at the top) ...", and so
my 8-lines context'ed patches are failing to apply due to that.
Options that were given to me are:

* generate myself a diff that has 3 lines of context just for the ChangeLog part
* change the "fuzz=3" to "fuzz=8" in svn-apply for ChangeLogs.

I support the later, but before anything I would like to know if you
guys have any objection? known issues?


--Antonio Gomes
webkit-dev mailing list
webkit-dev at lists.webkit.org
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.webkit.org/pipermail/webkit-dev/attachments/20100527/5995f36c/attachment.html>

More information about the webkit-dev mailing list