Re: [webkit-dev] changelog and patches
Run WebKitTools/Scripts/resolve-ChangeLogs each time you rebase. PS: try webkit-patch help --all-commands, from that same directory; in particular webkit-patch post-commits automates attaching your patch to a bug. On Tue, Feb 23, 2010 at 1:27 PM, arno a...@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 My second problem is that once I've updated git master branch, I can't rebase my private branch because again, changelogs have changed, and diffs do not apply correctly. So, what's wrong with my approach ? How do you manage multiple patches efficiently without being hampered by those changelog diff problems ? thanks a lot arno -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.10 (GNU/Linux) iEYEARECAAYFAkuDya8ACgkQ7Z0ZxRdGQ+fVrACfV5kyuaiv5zF63dpXvFGeZj/J E6AAnAy6ncq7zseXZwZSa/nIBAkZGV3k =3Y2/ -END PGP SIGNATURE- ___ webkit-dev mailing list webkit-dev@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-dev ___ webkit-dev mailing list webkit-dev@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-dev
Re: [webkit-dev] changelog and patches
On Tue, Feb 23, 2010 at 4:27 AM, arno a...@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 ___ webkit-dev mailing list webkit-dev@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-dev
Re: [webkit-dev] changelog and patches
On 23/2/10 13:31 , Evan Martin wrote: Run WebKitTools/Scripts/resolve-ChangeLogs each time you rebase. Or run once: git config merge.changelog.driver resolve-ChangeLogs --merge-driver %O %A %B tor arne ___ webkit-dev mailing list webkit-dev@lists.webkit.org http://lists.webkit.org/mailman/listinfo.cgi/webkit-dev
