[webkit-dev] changelog and patches

[arno]

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
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.webkit.org/pipermail/webkit-dev/attachments/20100223/38bea023/attachment.bin>