[webkit-dev] changelog and patches

[Chris Jerdonek]

On Tue, Feb 23, 2010 at 4:27 AM, arno <arno at renevier.net> wrote:
> Hi,
> I've recently submitted a few patches.
>
> My workflow is as follow:
> I use git repository.
> Once I've made my modifications, I run WebKitTools/Scripts/prepare-ChangeLog,
> then I git-commit changeset in a private branch, then I export my patch with
> git-format-patch or git-diff
>
> My first problem is that sometimes, my patch does not apply because of
> changelog. I suppose it's because webkit changelog has changed in the
> repository. See for example attachment 49123 in bug #35191

Your first problem doesn't seem to be because of ChangeLog files, at
least in the bug you referenced.  It looks like that patch didn't
apply because the first line of the patch you submitted is not the
"diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog" line.  It is a
known issue that svn-apply doesn't work if the patch has "leading
junk".  See this report, for example:

https://bugs.webkit.org/show_bug.cgi?id=33119

Using git-diff instead of git-format-patch should probably resolve that one.

Also read the wiki page about using Git with WebKit:

http://trac.webkit.org/wiki/UsingGitWithWebKit

--Chris