[webkit-dev] changelog and patches

[Evan Martin]

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 <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
>
> 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 at lists.webkit.org
> http://lists.webkit.org/mailman/listinfo.cgi/webkit-dev
>
>