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

tonikitoo (Antonio Gomes) tonikitoo at gmail.com
Mon May 24 11:55:03 PDT 2010


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

More information about the webkit-dev mailing list